diff --git a/src/Avalonia.Layout/NonVirtualizingStackLayout.cs b/src/Avalonia.Layout/NonVirtualizingStackLayout.cs
index 0b730315e1..6fa8601916 100644
--- a/src/Avalonia.Layout/NonVirtualizingStackLayout.cs
+++ b/src/Avalonia.Layout/NonVirtualizingStackLayout.cs
@@ -112,7 +112,9 @@ namespace Avalonia.Layout
                 u = (isVertical ? bounds.Bottom : bounds.Right) + spacing;
             }
 
-            return new Size(bounds.Right, bounds.Bottom);
+            return new Size(
+                Math.Max(finalSize.Width, bounds.Width),
+                Math.Max(finalSize.Height, bounds.Height));
         }
 
         private static Rect LayoutVertical(ILayoutable element, double y, Size constraint)