diff --git a/Perspex.Controls/Presenters/ScrollContentPresenter.cs b/Perspex.Controls/Presenters/ScrollContentPresenter.cs
index 89458b834b..a79f0785d0 100644
--- a/Perspex.Controls/Presenters/ScrollContentPresenter.cs
+++ b/Perspex.Controls/Presenters/ScrollContentPresenter.cs
@@ -95,7 +95,7 @@ namespace Perspex.Controls.Presenters
 
             if (child != null)
             {
-                child.Arrange(new Rect((Point)(-this.Offset), finalSize));
+                child.Arrange(new Rect((Point)(-this.Offset), child.DesiredSize.Value));
                 return finalSize;
             }
 
diff --git a/Perspex.Themes.Default/ListBoxStyle.cs b/Perspex.Themes.Default/ListBoxStyle.cs
index 9269f36ba5..85c79b9d6d 100644
--- a/Perspex.Themes.Default/ListBoxStyle.cs
+++ b/Perspex.Themes.Default/ListBoxStyle.cs
@@ -9,6 +9,7 @@ namespace Perspex.Themes.Default
     using System.Linq;
     using Perspex.Controls;
     using Perspex.Controls.Presenters;
+    using Perspex.Layout;
     using Perspex.Media;
     using Perspex.Styling;