diff --git a/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml b/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml
index 191a87d6..3f58942f 100644
--- a/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml
+++ b/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml
@@ -92,19 +92,18 @@
                 </animations:Implicit.ShowAnimations>
             </TextBlock>
 
-            <Grid
-                x:Name="ContentGrid"
+            <!--  Shell Sub Content  -->
+            <ContentPresenter
+                x:Name="ShellContentContainer"
                 Grid.Column="1"
-                Background="Transparent">
-                <!--  Shell Sub Content  -->
-                <ContentPresenter Canvas.ZIndex="2" Content="{x:Bind ShellFrameContent, Mode=OneWay}">
-                    <ContentPresenter.ContentTransitions>
-                        <TransitionCollection>
-                            <PaneThemeTransition Edge="Top" />
-                        </TransitionCollection>
-                    </ContentPresenter.ContentTransitions>
-                </ContentPresenter>
-            </Grid>
+                Canvas.ZIndex="2"
+                Content="{x:Bind ShellFrameContent, Mode=OneWay}">
+                <ContentPresenter.ContentTransitions>
+                    <TransitionCollection>
+                        <PaneThemeTransition Edge="Top" />
+                    </TransitionCollection>
+                </ContentPresenter.ContentTransitions>
+            </ContentPresenter>
         </Grid>
     </Grid>
 </UserControl>
diff --git a/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml.cs b/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml.cs
index 7396bc91..66415a64 100644
--- a/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml.cs
+++ b/Wino.Mail/Controls/Advanced/WinoAppTitleBar.xaml.cs
@@ -101,9 +101,9 @@ namespace Wino.Controls.Advanced
             UpdateLayout();
 
             CoreWindowTitleTextBlock.Visibility = Visibility.Collapsed;
-            ContentGrid.Width = double.NaN;
-            ContentGrid.Margin = new Thickness(0, 0, 0, 0);
-            ContentGrid.HorizontalAlignment = HorizontalAlignment.Stretch;
+            ShellContentContainer.Width = double.NaN;
+            ShellContentContainer.Margin = new Thickness(0, 0, 0, 0);
+            ShellContentContainer.HorizontalAlignment = HorizontalAlignment.Stretch;
 
             EmptySpaceWidth.Width = new GridLength(1, GridUnitType.Star);
 
@@ -118,8 +118,8 @@ namespace Wino.Controls.Advanced
 
                 if (!IsReaderNarrowed)
                 {
-                    ContentGrid.HorizontalAlignment = HorizontalAlignment.Left;
-                    ContentGrid.Width = ReadingPaneLength;
+                    ShellContentContainer.HorizontalAlignment = HorizontalAlignment.Left;
+                    ShellContentContainer.Width = ReadingPaneLength;
                 }
             }
             else if (NavigationViewDisplayMode == Microsoft.UI.Xaml.Controls.NavigationViewDisplayMode.Expanded)
@@ -129,12 +129,12 @@ namespace Wino.Controls.Advanced
                     CoreWindowTitleTextBlock.Visibility = Visibility.Visible;
 
                     // LMargin = OpenPaneLength - LeftMenuStackPanel
-                    ContentGrid.Margin = new Thickness(OpenPaneLength - LeftMenuStackPanel.ActualSize.X, 0, 0, 0);
+                    ShellContentContainer.Margin = new Thickness(OpenPaneLength - LeftMenuStackPanel.ActualSize.X, 0, 0, 0);
 
                     if (!IsReaderNarrowed)
                     {
-                        ContentGrid.HorizontalAlignment = HorizontalAlignment.Left;
-                        ContentGrid.Width = ReadingPaneLength;
+                        ShellContentContainer.HorizontalAlignment = HorizontalAlignment.Left;
+                        ShellContentContainer.Width = ReadingPaneLength;
                     }
                 }
                 else