diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 0695d9d17a..3681298a72 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -14,8 +14,8 @@
         <Setter Property="HorizontalAlignment" Value="Left" />
       </Style>
     </Grid.Styles>
-      <controls:HamburgerMenu Name="Sidebar">
-        <TabItem Header="Composition">
+    <controls:HamburgerMenu Name="Sidebar">
+      <TabItem Header="Composition">
         <pages:CompositionPage/>
       </TabItem>
       <TabItem Header="Acrylic">
diff --git a/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs b/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs
index ab61dcde91..7ff8160720 100644
--- a/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs
+++ b/samples/SampleControls/HamburgerMenu/HamburgerMenu.cs
@@ -52,6 +52,14 @@ namespace ControlSamples
                 var (oldBounds, newBounds) = change.GetOldAndNewValue<Rect>();
                 EnsureSplitViewMode(oldBounds, newBounds);
             }
+
+            if (change.Property == SelectedItemProperty)
+            {
+                if (_splitView is not null && _splitView.DisplayMode == SplitViewDisplayMode.Overlay)
+                {
+                    _splitView.SetValue(SplitView.IsPaneOpenProperty, false, Avalonia.Data.BindingPriority.Animation);
+                }
+            }
         }
 
         private void EnsureSplitViewMode(Rect oldBounds, Rect newBounds)
@@ -60,12 +68,12 @@ namespace ControlSamples
             {
                 var threshold = ExpandedModeThresholdWidth;
 
-                if (newBounds.Width >= threshold && oldBounds.Width < threshold)
+                if (newBounds.Width >= threshold)
                 {
                     _splitView.DisplayMode = SplitViewDisplayMode.Inline;
                     _splitView.IsPaneOpen = true;
                 }
-                else if (newBounds.Width < threshold && oldBounds.Width >= threshold)
+                else if (newBounds.Width < threshold)
                 {
                     _splitView.DisplayMode = SplitViewDisplayMode.Overlay;
                     _splitView.IsPaneOpen = false;