diff --git a/src/Controls/src/Core/Handlers/Shell/ShellHandler.cs b/src/Controls/src/Core/Handlers/Shell/ShellHandler.cs
index d1a86acc1e9b..94bcd4394822 100644
--- a/src/Controls/src/Core/Handlers/Shell/ShellHandler.cs
+++ b/src/Controls/src/Core/Handlers/Shell/ShellHandler.cs
@@ -14,33 +14,33 @@ public partial class ShellHandler
 		public static PropertyMapper<Shell, ShellHandler> Mapper =
 				new PropertyMapper<Shell, ShellHandler>(ElementMapper)
 				{
-					[nameof(Shell.CurrentItem)] = MapCurrentItem,
-					[nameof(Shell.FlyoutBackground)] = MapFlyoutBackground,
-					[nameof(Shell.FlyoutBackgroundColor)] = MapFlyoutBackground,
-					[nameof(Shell.FlyoutBackdrop)] = MapFlyoutBackdrop,
-					[nameof(Shell.FlyoutHeader)] = MapFlyoutHeader,
-					[nameof(Shell.FlyoutHeaderTemplate)] = MapFlyoutHeader,
-					[nameof(Shell.FlyoutFooter)] = MapFlyoutFooter,
-					[nameof(Shell.FlyoutFooterTemplate)] = MapFlyoutFooter,
-					[nameof(Shell.FlyoutHeaderBehavior)] = MapFlyoutHeaderBehavior,
-					[nameof(IFlyoutView.FlyoutBehavior)] = MapFlyoutBehavior,
-					[nameof(IFlyoutView.FlyoutWidth)] = MapFlyoutWidth,
-					[nameof(IFlyoutView.IsPresented)] = MapIsPresented,
-					[nameof(Shell.FlyoutContent)] = MapFlyout,
-					[nameof(Shell.FlyoutContentTemplate)] = MapFlyout,
-					[nameof(Shell.FlowDirection)] = MapFlowDirection,
-					[nameof(Shell.FlyoutBackgroundImage)] = MapFlyoutBackgroundImage,
-					[nameof(Shell.FlyoutBackgroundImageAspect)] = MapFlyoutBackgroundImage,
-					[nameof(Shell.FlyoutVerticalScrollMode)] = MapFlyoutVerticalScrollMode,
-
 #if WINDOWS || TIZEN
-					[nameof(IToolbarElement.Toolbar)] = (handler, view) => ViewHandler.MapToolbar(handler, view),
-					[nameof(IFlyoutView.Flyout)] = MapFlyout,
-					[nameof(Shell.Items)] = MapItems,
-					[nameof(Shell.FlyoutItems)] = MapFlyoutItems,
-					[nameof(Shell.FlyoutIcon)] = MapFlyoutIcon,
+				[nameof(IToolbarElement.Toolbar)] = (handler, view) => ViewHandler.MapToolbar(handler, view),
+				[nameof(IFlyoutView.Flyout)] = MapFlyout,
 #endif
-
+				[nameof(IFlyoutView.IsPresented)] = MapIsPresented,
+				[nameof(IFlyoutView.FlyoutBehavior)] = MapFlyoutBehavior,
+				[nameof(IFlyoutView.FlyoutWidth)] = MapFlyoutWidth,
+				[nameof(Shell.FlyoutBackground)] = MapFlyoutBackground,
+				[nameof(Shell.FlyoutBackgroundColor)] = MapFlyoutBackground,
+				[nameof(Shell.FlyoutContent)] = MapFlyout,
+				[nameof(Shell.CurrentItem)] = MapCurrentItem,
+				[nameof(Shell.FlyoutBackdrop)] = MapFlyoutBackdrop,
+				[nameof(Shell.FlyoutFooter)] = MapFlyoutFooter,
+				[nameof(Shell.FlyoutFooterTemplate)] = MapFlyoutFooter,
+				[nameof(Shell.FlyoutHeader)] = MapFlyoutHeader,
+				[nameof(Shell.FlyoutHeaderTemplate)] = MapFlyoutHeader,
+				[nameof(Shell.FlyoutHeaderBehavior)] = MapFlyoutHeaderBehavior,
+#if WINDOWS || TIZEN
+				[nameof(Shell.Items)] = MapItems,
+				[nameof(Shell.FlyoutItems)] = MapFlyoutItems,
+				[nameof(Shell.FlyoutIcon)] = MapFlyoutIcon,
+#endif
+				[nameof(Shell.FlyoutContentTemplate)] = MapFlyout,
+				[nameof(Shell.FlowDirection)] = MapFlowDirection,
+				[nameof(Shell.FlyoutBackgroundImage)] = MapFlyoutBackgroundImage,
+				[nameof(Shell.FlyoutBackgroundImageAspect)] = MapFlyoutBackgroundImage,
+				[nameof(Shell.FlyoutVerticalScrollMode)] = MapFlyoutVerticalScrollMode,
 #if ANDROID
 					[nameof(Shell.FlyoutHeight)] = MapFlyoutHeight,
 #endif