diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
index 23f66358dc0..83ad8ad9008 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
@@ -116,11 +116,12 @@
                 <RowDefinition Height="*" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-            <ScrollViewer Grid.Row="0">
-                <Frame x:Name="contentFrame" />
-            </ScrollViewer>
+            <Frame x:Name="contentFrame"
+                   Grid.Row="0" />
+            <!--  Explicitly set the background color on grid to prevent the navigation animation from overflowing it  -->
             <Grid Grid.Row="1"
                   Height="100"
+                  Background="{ThemeResource SystemAltHighColor}"
                   BorderBrush="{ThemeResource SystemBaseLowColor}"
                   BorderThickness="0,1,0,0">
                 <Grid.ColumnDefinitions>