diff --git a/src/Controls/src/Core/Handlers/Shell/ShellHandler.Windows.cs b/src/Controls/src/Core/Handlers/Shell/ShellHandler.Windows.cs
index 81dbec6b344d..2d9420e09bf3 100644
--- a/src/Controls/src/Core/Handlers/Shell/ShellHandler.Windows.cs
+++ b/src/Controls/src/Core/Handlers/Shell/ShellHandler.Windows.cs
@@ -149,6 +149,11 @@ public static void MapFlyout(ShellHandler handler, IFlyoutView flyoutView)
 
 		}
 
+		internal static void MapFlowDirection(ShellHandler handler, Shell view)
+		{
+			handler.PlatformView.UpdateFlowDirection(view);
+		}
+
 		public static void MapIsPresented(ShellHandler handler, IFlyoutView flyoutView)
 		{
 			// WinUI Will close the pane inside of the apply template code
diff --git a/src/Controls/src/Core/Handlers/Shell/ShellHandler.cs b/src/Controls/src/Core/Handlers/Shell/ShellHandler.cs
index 3e95a660e4db..5d270d7459f9 100644
--- a/src/Controls/src/Core/Handlers/Shell/ShellHandler.cs
+++ b/src/Controls/src/Core/Handlers/Shell/ShellHandler.cs
@@ -34,6 +34,7 @@ public partial class ShellHandler
 #if WINDOWS
 					[nameof(Shell.FlyoutIcon)] = MapFlyoutIcon,
 					[nameof(Shell.FlyoutContentTemplate)] = MapFlyout,
+					[nameof(Shell.FlowDirection)] = MapFlowDirection,
 #endif
 				};
 
diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShellFlowDirectionUpdate.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShellFlowDirectionUpdate.png
index 297eb2c85753..8e7b133d7fc3 100644
Binary files a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShellFlowDirectionUpdate.png and b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/ShellFlowDirectionUpdate.png differ
diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellFlowDirectionUpdate.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellFlowDirectionUpdate.png
index 6e80b295f641..d6a4d1ca2b85 100644
Binary files a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellFlowDirectionUpdate.png and b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/ShellFlowDirectionUpdate.png differ
diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17057.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17057.cs
index 97b019d89ecf..db0ffc07b5f4 100644
--- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17057.cs
+++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17057.cs
@@ -1,5 +1,4 @@
-#if TEST_FAILS_ON_WINDOWS // To fix the issue in windows https://github.com/dotnet/maui/issues/27947
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 using UITest.Core;
 
@@ -17,8 +16,8 @@ public Issue17057(TestDevice testDevice) : base(testDevice)
 		public void ShellFlowDirectionUpdate()
 		{
 			App.WaitForElement("label");
+			App.TapShellFlyoutIcon();
 			VerifyScreenshot();
 		}
 	}
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellFlowDirectionUpdate.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellFlowDirectionUpdate.png
new file mode 100644
index 000000000000..1c8d28301216
Binary files /dev/null and b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/ShellFlowDirectionUpdate.png differ
diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShellFlowDirectionUpdate.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShellFlowDirectionUpdate.png
index cc68961cc012..8e2e96c9c7b2 100644
Binary files a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShellFlowDirectionUpdate.png and b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/ShellFlowDirectionUpdate.png differ