diff --git a/Perspex.Layout/LayoutManager.cs b/Perspex.Layout/LayoutManager.cs
index 6e61a5e7b4..d89f1ab282 100644
--- a/Perspex.Layout/LayoutManager.cs
+++ b/Perspex.Layout/LayoutManager.cs
@@ -161,11 +161,12 @@ namespace Perspex.Layout
                 {
                     this.Root.Measure(this.Root.ClientSize);
                 }
-                else
+
+                foreach (var item in measure)
                 {
-                    foreach (var item in measure)
+                    if (!item.Control.IsMeasureValid)
                     {
-                        if (!item.Control.IsMeasureValid)
+                        if (item.Control != this.Root)
                         {
                             var parent = item.Control.GetVisualParent<ILayoutable>();
 
diff --git a/Perspex.Layout/Layoutable.cs b/Perspex.Layout/Layoutable.cs
index 243067005b..b19b88f8a7 100644
--- a/Perspex.Layout/Layoutable.cs
+++ b/Perspex.Layout/Layoutable.cs
@@ -173,12 +173,12 @@ namespace Perspex.Layout
                 throw new InvalidOperationException("Cannot call Measure using a size with NaN values.");
             }
 
-            if (force || this.previousMeasure != availableSize)
+            if (force || !this.IsMeasureValid || this.previousMeasure != availableSize)
             {
                 ++DebugMeasureCount;
 
-                this.DesiredSize = this.MeasureCore(availableSize).Constrain(availableSize);
                 this.IsMeasureValid = true;
+                this.DesiredSize = this.MeasureCore(availableSize).Constrain(availableSize);
                 this.previousMeasure = availableSize;
 
                 this.Log().Debug(
@@ -203,7 +203,7 @@ namespace Perspex.Layout
                 throw new InvalidOperationException("Arrange called before Measure.");
             }
 
-            if (force || this.previousArrange != rect)
+            if (force || !this.IsArrangeValid || this.previousArrange != rect)
             {
                 ++DebugArrangeCount;
 
@@ -213,53 +213,46 @@ namespace Perspex.Layout
                     this.GetHashCode(),
                     rect);
 
+                this.IsArrangeValid = true;
                 this.ArrangeCore(rect);
                 this.previousArrange = rect;
             }
-
-            this.IsArrangeValid = true;
         }
 
         public void InvalidateMeasure()
         {
-            if (this.IsMeasureValid)
-            {
-                var parent = this.GetVisualParent<ILayoutable>();
+            var parent = this.GetVisualParent<ILayoutable>();
 
-                this.IsMeasureValid = false;
-                this.IsArrangeValid = false;
-                this.previousMeasure = null;
-                this.previousArrange = null;
+            this.IsMeasureValid = false;
+            this.IsArrangeValid = false;
+            this.previousMeasure = null;
+            this.previousArrange = null;
 
-                if (parent != null && IsResizable(parent))
-                {
-                    parent.InvalidateMeasure();
-                }
-                else
-                {
-                    var root = this.GetLayoutRoot();
+            if (parent != null && IsResizable(parent))
+            {
+                parent.InvalidateMeasure();
+            }
+            else
+            {
+                var root = this.GetLayoutRoot();
 
-                    if (root != null && root.Item1.LayoutManager != null)
-                    {
-                        root.Item1.LayoutManager.InvalidateMeasure(this, root.Item2);
-                    }
+                if (root != null && root.Item1.LayoutManager != null)
+                {
+                    root.Item1.LayoutManager.InvalidateMeasure(this, root.Item2);
                 }
             }
         }
 
         public void InvalidateArrange()
         {
-            if (this.IsArrangeValid)
-            {
-                var root = this.GetLayoutRoot();
+            var root = this.GetLayoutRoot();
 
-                this.IsArrangeValid = false;
-                this.previousArrange = null;
+            this.IsArrangeValid = false;
+            this.previousArrange = null;
 
-                if (root != null && root.Item1.LayoutManager != null)
-                {
-                    root.Item1.LayoutManager.InvalidateArrange(this, root.Item2);
-                }
+            if (root != null && root.Item1.LayoutManager != null)
+            {
+                root.Item1.LayoutManager.InvalidateArrange(this, root.Item2);
             }
         }