diff --git a/src/Eto.Wpf/Forms/Controls/ScrollableHandler.cs b/src/Eto.Wpf/Forms/Controls/ScrollableHandler.cs
index 1a3f4f53d..6164cde54 100755
--- a/src/Eto.Wpf/Forms/Controls/ScrollableHandler.cs
+++ b/src/Eto.Wpf/Forms/Controls/ScrollableHandler.cs
@@ -221,7 +221,8 @@ public bool ExpandContentHeight
 		public override void OnChildPreferredSizeUpdated()
 		{
 			base.OnChildPreferredSizeUpdated();
-			UpdateScrollSizes();
+			if (ExpandContentWidth || ExpandContentHeight)
+				UpdateSizes();
 		}
 	}
 }