diff --git a/src/Avalonia.Layout/StackLayout.cs b/src/Avalonia.Layout/StackLayout.cs
index 3cc094f091..e89d178b0e 100644
--- a/src/Avalonia.Layout/StackLayout.cs
+++ b/src/Avalonia.Layout/StackLayout.cs
@@ -293,9 +293,11 @@ namespace Avalonia.Layout
         {
             if (e.Property == OrientationProperty)
             {
+                var orientation = (Orientation)e.NewValue;
+
                 //Note: For StackLayout Vertical Orientation means we have a Vertical ScrollOrientation.
                 //Horizontal Orientation means we have a Horizontal ScrollOrientation.
-                _orientation.ScrollOrientation = (ScrollOrientation)e.NewValue;
+                _orientation.ScrollOrientation = orientation == Orientation.Horizontal ? ScrollOrientation.Horizontal : ScrollOrientation.Vertical;
             }
 
             InvalidateLayout();