Repository: microsoft/terminal (language: cpp)

Issue:
Settings tab scroll is lost after every save
### Windows Terminal version

1.11.2921.0

### Windows build number

10.0.22000.0

### Other Software

_No response_

### Steps to reproduce

1) Open Settings tab (Ctrl + ,)
2) Go to some profile from sidebar 
3) Vertically scroll to some position
4) Hit 'Save' button

### Expected Behavior

Just saving with no extra effect

### Actual Behavior

The entire page flashes and the page scroll bar is reset at the top (It seems that a full refresh of page is happening).
It's more annoying if you want to change something not at the top of page (like background settings) and want to see the actual result and refine the settings many times.


Discussion / hints:
This might not be too hard to fix. I believe that a ScrollViewer has a method for getting the current scroll position, so we _should_ be able to persist that across saves.
Hi, I wanted to start contributing to open source project and I found this one to be of great interest to me. I took a shot at this issue and submitted a PR #12296. I'd appreciate it if I could get some feedback on this. Thank you.
I want to work on this issue. Please assign me this issue.
Hello, I will take over this issue if no one is working on it. Please assign to me, thanks!
Y'all can just go for it - we don't _really_ utilize the "assigned to" field. There's very rarely multiple people who are trying to work on the same issue at the same time.

Fix patch:
diff --git a/src/cascadia/TerminalSettingsEditor/Actions.xaml b/src/cascadia/TerminalSettingsEditor/Actions.xaml
index ade657307c4..0c48e710e7f 100644
--- a/src/cascadia/TerminalSettingsEditor/Actions.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Actions.xaml
@@ -326,31 +326,29 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <ScrollViewer ViewChanging="ViewChanging">
-        <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
-            <StackPanel MaxWidth="600"
-                        HorizontalAlignment="Left"
-                        Spacing="8"
-                        Style="{StaticResource SettingsStackStyle}">
-                <!--  Add New Button  -->
-                <Button x:Name="AddNewButton"
-                        Click="AddNew_Click">
-                    <Button.Content>
-                        <StackPanel Orientation="Horizontal">
-                            <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                      Glyph="&#xE710;" />
-                            <TextBlock x:Uid="Actions_AddNewTextBlock"
-                                       Style="{StaticResource IconButtonTextBlockStyle}" />
-                        </StackPanel>
-                    </Button.Content>
-                </Button>
+    <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
+        <StackPanel MaxWidth="600"
+                    HorizontalAlignment="Left"
+                    Spacing="8"
+                    Style="{StaticResource SettingsStackStyle}">
+            <!--  Add New Button  -->
+            <Button x:Name="AddNewButton"
+                    Click="AddNew_Click">
+                <Button.Content>
+                    <StackPanel Orientation="Horizontal">
+                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                  Glyph="&#xE710;" />
+                        <TextBlock x:Uid="Actions_AddNewTextBlock"
+                                   Style="{StaticResource IconButtonTextBlockStyle}" />
+                    </StackPanel>
+                </Button.Content>
+            </Button>
 
-                <!--  Keybindings  -->
-                <ListView x:Name="KeyBindingsListView"
-                          ItemTemplate="{StaticResource KeyBindingTemplate}"
-                          ItemsSource="{x:Bind KeyBindingList, Mode=OneWay}"
-                          SelectionMode="None" />
-            </StackPanel>
-        </Border>
-    </ScrollViewer>
+            <!--  Keybindings  -->
+            <ListView x:Name="KeyBindingsListView"
+                      ItemTemplate="{StaticResource KeyBindingTemplate}"
+                      ItemsSource="{x:Bind KeyBindingList, Mode=OneWay}"
+                      SelectionMode="None" />
+        </StackPanel>
+    </Border>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/AddProfile.xaml b/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
index 25a6bbc0a81..e586f2eca93 100644
--- a/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
+++ b/src/cascadia/TerminalSettingsEditor/AddProfile.xaml
@@ -21,72 +21,70 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <ScrollViewer ViewChanging="ViewChanging">
-        <StackPanel Style="{StaticResource SettingsStackStyle}">
+    <StackPanel Style="{StaticResource SettingsStackStyle}">
+        <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
+            <Button x:Name="AddNewButton"
+                    Click="AddNewClick"
+                    Style="{StaticResource AccentButtonStyle}">
+                <Button.Content>
+                    <StackPanel Orientation="Horizontal">
+                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                  Glyph="&#xE710;" />
+                        <TextBlock x:Uid="AddProfile_AddNewTextBlock"
+                                   Style="{StaticResource IconButtonTextBlockStyle}" />
+                    </StackPanel>
+                </Button.Content>
+            </Button>
+        </Border>
+        <StackPanel Margin="{StaticResource StandardControlMargin}">
+            <local:SettingContainer x:Uid="AddProfile_Duplicate">
+                <ComboBox x:Name="Profiles"
+                          AutomationProperties.AccessibilityView="Content"
+                          ItemsSource="{x:Bind State.Settings.AllProfiles, Mode=OneWay}"
+                          SelectedIndex="0"
+                          SelectionChanged="ProfilesSelectionChanged"
+                          Style="{StaticResource ComboBoxSettingStyle}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="model:Profile">
+                            <Grid HorizontalAlignment="Stretch"
+                                  ColumnSpacing="8">
+
+                                <Grid.ColumnDefinitions>
+                                    <!--  icon  -->
+                                    <ColumnDefinition Width="16" />
+                                    <!--  profile name  -->
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <IconSourceElement Grid.Column="0"
+                                                   Width="16"
+                                                   Height="16"
+                                                   IconSource="{x:Bind Icon, Converter={StaticResource IconSourceConverter}}" />
+
+                                <TextBlock Grid.Column="1"
+                                           Text="{x:Bind Name}" />
+
+                            </Grid>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </local:SettingContainer>
             <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
-                <Button x:Name="AddNewButton"
-                        Click="AddNewClick"
+                <Button x:Name="DuplicateButton"
+                        Margin="{StaticResource StandardControlMargin}"
+                        Click="DuplicateClick"
+                        IsEnabled="{x:Bind IsProfileSelected, Mode=OneWay}"
                         Style="{StaticResource AccentButtonStyle}">
                     <Button.Content>
                         <StackPanel Orientation="Horizontal">
                             <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                      Glyph="&#xE710;" />
-                            <TextBlock x:Uid="AddProfile_AddNewTextBlock"
+                                      Glyph="&#xE8C8;" />
+                            <TextBlock x:Uid="AddProfile_DuplicateTextBlock"
                                        Style="{StaticResource IconButtonTextBlockStyle}" />
                         </StackPanel>
                     </Button.Content>
                 </Button>
             </Border>
-            <StackPanel Margin="{StaticResource StandardControlMargin}">
-                <local:SettingContainer x:Uid="AddProfile_Duplicate">
-                    <ComboBox x:Name="Profiles"
-                              AutomationProperties.AccessibilityView="Content"
-                              ItemsSource="{x:Bind State.Settings.AllProfiles, Mode=OneWay}"
-                              SelectedIndex="0"
-                              SelectionChanged="ProfilesSelectionChanged"
-                              Style="{StaticResource ComboBoxSettingStyle}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate x:DataType="model:Profile">
-                                <Grid HorizontalAlignment="Stretch"
-                                      ColumnSpacing="8">
-
-                                    <Grid.ColumnDefinitions>
-                                        <!--  icon  -->
-                                        <ColumnDefinition Width="16" />
-                                        <!--  profile name  -->
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-
-                                    <IconSourceElement Grid.Column="0"
-                                                       Width="16"
-                                                       Height="16"
-                                                       IconSource="{x:Bind Icon, Converter={StaticResource IconSourceConverter}}" />
-
-                                    <TextBlock Grid.Column="1"
-                                               Text="{x:Bind Name}" />
-
-                                </Grid>
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-                </local:SettingContainer>
-                <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
-                    <Button x:Name="DuplicateButton"
-                            Margin="{StaticResource StandardControlMargin}"
-                            Click="DuplicateClick"
-                            IsEnabled="{x:Bind IsProfileSelected, Mode=OneWay}"
-                            Style="{StaticResource AccentButtonStyle}">
-                        <Button.Content>
-                            <StackPanel Orientation="Horizontal">
-                                <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                          Glyph="&#xE8C8;" />
-                                <TextBlock x:Uid="AddProfile_DuplicateTextBlock"
-                                           Style="{StaticResource IconButtonTextBlockStyle}" />
-                            </StackPanel>
-                        </Button.Content>
-                    </Button>
-                </Border>
-            </StackPanel>
         </StackPanel>
-    </ScrollViewer>
+    </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml b/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml
index 50a0c1357bb..8e68567bb82 100644
--- a/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml
+++ b/src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml
@@ -82,421 +82,419 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <ScrollViewer ViewChanging="ViewChanging">
-        <StackPanel Style="{StaticResource SettingsStackStyle}">
-            <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
-                <!--  Preview of the selected scheme  -->
-                <Grid Width="350"
-                      Height="160"
-                      MaxWidth="{StaticResource StandardControlMaxWidth}"
-                      Margin="4"
-                      HorizontalAlignment="Left"
-                      Background="{x:Bind local:Converters.ColorToBrush(ViewModel.BackgroundColor.Color), Mode=OneWay}"
-                      BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
-                      BorderThickness="1">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <ContentControl Grid.Row="0"
-                                    Grid.Column="0"
-                                    Content="{x:Bind ViewModel.ForegroundColor, Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="1"
-                                    Grid.Column="0"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(0), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="2"
-                                    Grid.Column="0"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(1), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="3"
-                                    Grid.Column="0"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(2), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="4"
-                                    Grid.Column="0"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(3), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="5"
-                                    Grid.Column="0"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(4), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="6"
-                                    Grid.Column="0"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(5), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="7"
-                                    Grid.Column="0"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(6), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="8"
-                                    Grid.Column="0"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(7), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="1"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(8), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="2"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(9), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="3"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(10), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="4"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(11), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="5"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(12), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="6"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(13), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="7"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(14), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
-                    <ContentControl Grid.Row="8"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(15), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
-                                    IsTabStop="False" />
+    <StackPanel Style="{StaticResource SettingsStackStyle}">
+        <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
+            <!--  Preview of the selected scheme  -->
+            <Grid Width="350"
+                  Height="160"
+                  MaxWidth="{StaticResource StandardControlMaxWidth}"
+                  Margin="4"
+                  HorizontalAlignment="Left"
+                  Background="{x:Bind local:Converters.ColorToBrush(ViewModel.BackgroundColor.Color), Mode=OneWay}"
+                  BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
+                  BorderThickness="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <ContentControl Grid.Row="0"
+                                Grid.Column="0"
+                                Content="{x:Bind ViewModel.ForegroundColor, Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="1"
+                                Grid.Column="0"
+                                Content="{x:Bind ViewModel.ColorEntryAt(0), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="2"
+                                Grid.Column="0"
+                                Content="{x:Bind ViewModel.ColorEntryAt(1), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="3"
+                                Grid.Column="0"
+                                Content="{x:Bind ViewModel.ColorEntryAt(2), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="4"
+                                Grid.Column="0"
+                                Content="{x:Bind ViewModel.ColorEntryAt(3), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="5"
+                                Grid.Column="0"
+                                Content="{x:Bind ViewModel.ColorEntryAt(4), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="6"
+                                Grid.Column="0"
+                                Content="{x:Bind ViewModel.ColorEntryAt(5), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="7"
+                                Grid.Column="0"
+                                Content="{x:Bind ViewModel.ColorEntryAt(6), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="8"
+                                Grid.Column="0"
+                                Content="{x:Bind ViewModel.ColorEntryAt(7), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="1"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(8), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="2"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(9), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="3"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(10), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="4"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(11), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="5"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(12), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="6"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(13), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="7"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(14), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
+                <ContentControl Grid.Row="8"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(15), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableTextBlockTemplate}"
+                                IsTabStop="False" />
 
-                </Grid>
-            </Border>
+            </Grid>
+        </Border>
 
-            <local:SettingContainer x:Uid="ColorScheme_ColorsHeader"
-                                    StartExpanded="True"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
-                <Grid x:Name="ColorTableGrid"
-                      Style="{StaticResource ColorTableGridStyle}"
-                      XYFocusKeyboardNavigation="Enabled">
-                    <Grid.ColumnDefinitions>
-                        <!--  Labels  -->
-                        <ColumnDefinition Width="Auto" />
+        <local:SettingContainer x:Uid="ColorScheme_ColorsHeader"
+                                StartExpanded="True"
+                                Style="{StaticResource ExpanderSettingContainerStyle}">
+            <Grid x:Name="ColorTableGrid"
+                  Style="{StaticResource ColorTableGridStyle}"
+                  XYFocusKeyboardNavigation="Enabled">
+                <Grid.ColumnDefinitions>
+                    <!--  Labels  -->
+                    <ColumnDefinition Width="Auto" />
 
-                        <!--  Regular Colors  -->
-                        <ColumnDefinition Width="Auto" />
+                    <!--  Regular Colors  -->
+                    <ColumnDefinition Width="Auto" />
 
-                        <!--  Bright Colors  -->
-                        <ColumnDefinition Width="Auto" />
+                    <!--  Bright Colors  -->
+                    <ColumnDefinition Width="Auto" />
 
-                        <ColumnDefinition Width="50" />
+                    <ColumnDefinition Width="50" />
 
-                        <!--  Labels  -->
-                        <ColumnDefinition Width="Auto" />
+                    <!--  Labels  -->
+                    <ColumnDefinition Width="Auto" />
 
-                        <!--  Regular Colors  -->
-                        <ColumnDefinition Width="Auto" />
+                    <!--  Regular Colors  -->
+                    <ColumnDefinition Width="Auto" />
 
-                        <!--  Bright Colors  -->
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
+                    <!--  Bright Colors  -->
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
 
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <TextBlock x:Uid="ColorScheme_Black"
-                               Grid.Row="0"
-                               Grid.Column="0"
-                               Style="{StaticResource ColorLabelStyle}" />
-                    <ContentControl x:Name="NonBrightBlack"
-                                    Grid.Row="0"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(0), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                    <TextBlock x:Uid="ColorScheme_Red"
-                               Grid.Row="1"
-                               Grid.Column="0"
-                               Style="{StaticResource ColorLabelStyle}" />
-                    <ContentControl x:Name="NonBrightRed"
-                                    Grid.Row="1"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(1), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                    <TextBlock x:Uid="ColorScheme_Green"
-                               Grid.Row="2"
-                               Grid.Column="0"
-                               Style="{StaticResource ColorLabelStyle}" />
-                    <ContentControl x:Name="NonBrightGreen"
-                                    Grid.Row="2"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(2), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                    <TextBlock x:Uid="ColorScheme_Yellow"
-                               Grid.Row="3"
-                               Grid.Column="0"
-                               Style="{StaticResource ColorLabelStyle}" />
-                    <ContentControl x:Name="NonBrightYellow"
-                                    Grid.Row="3"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(3), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                    <TextBlock x:Uid="ColorScheme_Blue"
-                               Grid.Row="4"
-                               Grid.Column="0"
-                               Style="{StaticResource ColorLabelStyle}" />
-                    <ContentControl x:Name="NonBrightBlue"
-                                    Grid.Row="4"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(4), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                    <TextBlock x:Uid="ColorScheme_Purple"
-                               Grid.Row="5"
-                               Grid.Column="0"
-                               Style="{StaticResource ColorLabelStyle}" />
-                    <ContentControl x:Name="NonBrightPurple"
-                                    Grid.Row="5"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(5), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                    <TextBlock x:Uid="ColorScheme_Cyan"
-                               Grid.Row="6"
-                               Grid.Column="0"
-                               Style="{StaticResource ColorLabelStyle}" />
-                    <ContentControl x:Name="NonBrightCyan"
-                                    Grid.Row="6"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(6), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                    <TextBlock x:Uid="ColorScheme_White"
-                               Grid.Row="7"
-                               Grid.Column="0"
-                               Style="{StaticResource ColorLabelStyle}" />
-                    <ContentControl x:Name="NonBrightWhite"
-                                    Grid.Row="7"
-                                    Grid.Column="1"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(7), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                    <ContentControl x:Name="BrightBlack"
-                                    Grid.Row="0"
-                                    Grid.Column="2"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(8), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                    <ContentControl x:Name="BrightRed"
-                                    Grid.Row="1"
-                                    Grid.Column="2"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(9), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                    <ContentControl x:Name="BrightGreen"
-                                    Grid.Row="2"
-                                    Grid.Column="2"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(10), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                    <ContentControl x:Name="BrightYellow"
-                                    Grid.Row="3"
-                                    Grid.Column="2"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(11), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                    <ContentControl x:Name="BrightBlue"
-                                    Grid.Row="4"
-                                    Grid.Column="2"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(12), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                    <ContentControl x:Name="BrightPurple"
-                                    Grid.Row="5"
-                                    Grid.Column="2"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(13), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                    <ContentControl x:Name="BrightCyan"
-                                    Grid.Row="6"
-                                    Grid.Column="2"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(14), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                    <ContentControl x:Name="BrightWhite"
-                                    Grid.Row="7"
-                                    Grid.Column="2"
-                                    Content="{x:Bind ViewModel.ColorEntryAt(15), Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <TextBlock x:Uid="ColorScheme_Black"
+                           Grid.Row="0"
+                           Grid.Column="0"
+                           Style="{StaticResource ColorLabelStyle}" />
+                <ContentControl x:Name="NonBrightBlack"
+                                Grid.Row="0"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(0), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+                <TextBlock x:Uid="ColorScheme_Red"
+                           Grid.Row="1"
+                           Grid.Column="0"
+                           Style="{StaticResource ColorLabelStyle}" />
+                <ContentControl x:Name="NonBrightRed"
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(1), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+                <TextBlock x:Uid="ColorScheme_Green"
+                           Grid.Row="2"
+                           Grid.Column="0"
+                           Style="{StaticResource ColorLabelStyle}" />
+                <ContentControl x:Name="NonBrightGreen"
+                                Grid.Row="2"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(2), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+                <TextBlock x:Uid="ColorScheme_Yellow"
+                           Grid.Row="3"
+                           Grid.Column="0"
+                           Style="{StaticResource ColorLabelStyle}" />
+                <ContentControl x:Name="NonBrightYellow"
+                                Grid.Row="3"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(3), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+                <TextBlock x:Uid="ColorScheme_Blue"
+                           Grid.Row="4"
+                           Grid.Column="0"
+                           Style="{StaticResource ColorLabelStyle}" />
+                <ContentControl x:Name="NonBrightBlue"
+                                Grid.Row="4"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(4), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+                <TextBlock x:Uid="ColorScheme_Purple"
+                           Grid.Row="5"
+                           Grid.Column="0"
+                           Style="{StaticResource ColorLabelStyle}" />
+                <ContentControl x:Name="NonBrightPurple"
+                                Grid.Row="5"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(5), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+                <TextBlock x:Uid="ColorScheme_Cyan"
+                           Grid.Row="6"
+                           Grid.Column="0"
+                           Style="{StaticResource ColorLabelStyle}" />
+                <ContentControl x:Name="NonBrightCyan"
+                                Grid.Row="6"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(6), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+                <TextBlock x:Uid="ColorScheme_White"
+                           Grid.Row="7"
+                           Grid.Column="0"
+                           Style="{StaticResource ColorLabelStyle}" />
+                <ContentControl x:Name="NonBrightWhite"
+                                Grid.Row="7"
+                                Grid.Column="1"
+                                Content="{x:Bind ViewModel.ColorEntryAt(7), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+                <ContentControl x:Name="BrightBlack"
+                                Grid.Row="0"
+                                Grid.Column="2"
+                                Content="{x:Bind ViewModel.ColorEntryAt(8), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+                <ContentControl x:Name="BrightRed"
+                                Grid.Row="1"
+                                Grid.Column="2"
+                                Content="{x:Bind ViewModel.ColorEntryAt(9), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+                <ContentControl x:Name="BrightGreen"
+                                Grid.Row="2"
+                                Grid.Column="2"
+                                Content="{x:Bind ViewModel.ColorEntryAt(10), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+                <ContentControl x:Name="BrightYellow"
+                                Grid.Row="3"
+                                Grid.Column="2"
+                                Content="{x:Bind ViewModel.ColorEntryAt(11), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+                <ContentControl x:Name="BrightBlue"
+                                Grid.Row="4"
+                                Grid.Column="2"
+                                Content="{x:Bind ViewModel.ColorEntryAt(12), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+                <ContentControl x:Name="BrightPurple"
+                                Grid.Row="5"
+                                Grid.Column="2"
+                                Content="{x:Bind ViewModel.ColorEntryAt(13), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+                <ContentControl x:Name="BrightCyan"
+                                Grid.Row="6"
+                                Grid.Column="2"
+                                Content="{x:Bind ViewModel.ColorEntryAt(14), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+                <ContentControl x:Name="BrightWhite"
+                                Grid.Row="7"
+                                Grid.Column="2"
+                                Content="{x:Bind ViewModel.ColorEntryAt(15), Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
 
-                    <!--  Foreground  -->
-                    <TextBlock x:Uid="ColorScheme_Foreground"
-                               Grid.Row="0"
-                               Grid.Column="4"
-                               Style="{StaticResource ColorLabelStyle}" />
-                    <ContentControl x:Name="ForegroundButton"
-                                    Grid.Row="0"
-                                    Grid.Column="5"
-                                    Content="{x:Bind ViewModel.ForegroundColor, Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
+                <!--  Foreground  -->
+                <TextBlock x:Uid="ColorScheme_Foreground"
+                           Grid.Row="0"
+                           Grid.Column="4"
+                           Style="{StaticResource ColorLabelStyle}" />
+                <ContentControl x:Name="ForegroundButton"
+                                Grid.Row="0"
+                                Grid.Column="5"
+                                Content="{x:Bind ViewModel.ForegroundColor, Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
 
-                    <!--  Background  -->
-                    <TextBlock x:Uid="ColorScheme_Background"
-                               Grid.Row="1"
-                               Grid.Column="4"
-                               Style="{StaticResource ColorLabelStyle}" />
-                    <ContentControl x:Name="BackgroundButton"
-                                    Grid.Row="1"
-                                    Grid.Column="5"
-                                    Content="{x:Bind ViewModel.BackgroundColor, Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
+                <!--  Background  -->
+                <TextBlock x:Uid="ColorScheme_Background"
+                           Grid.Row="1"
+                           Grid.Column="4"
+                           Style="{StaticResource ColorLabelStyle}" />
+                <ContentControl x:Name="BackgroundButton"
+                                Grid.Row="1"
+                                Grid.Column="5"
+                                Content="{x:Bind ViewModel.BackgroundColor, Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
 
-                    <!--  Cursor Color  -->
-                    <TextBlock x:Uid="ColorScheme_CursorColor"
-                               Grid.Row="2"
-                               Grid.Column="4"
-                               Style="{StaticResource ColorLabelStyle}" />
-                    <ContentControl x:Name="CursorColorButton"
-                                    Grid.Row="2"
-                                    Grid.Column="5"
-                                    Content="{x:Bind ViewModel.CursorColor, Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
+                <!--  Cursor Color  -->
+                <TextBlock x:Uid="ColorScheme_CursorColor"
+                           Grid.Row="2"
+                           Grid.Column="4"
+                           Style="{StaticResource ColorLabelStyle}" />
+                <ContentControl x:Name="CursorColorButton"
+                                Grid.Row="2"
+                                Grid.Column="5"
+                                Content="{x:Bind ViewModel.CursorColor, Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
 
-                    <!--  Selection Background  -->
-                    <TextBlock x:Uid="ColorScheme_SelectionBackground"
-                               Grid.Row="3"
-                               Grid.Column="4"
-                               Style="{StaticResource ColorLabelStyle}" />
-                    <ContentControl x:Name="SelectionBackgroundButton"
-                                    Grid.Row="3"
-                                    Grid.Column="5"
-                                    Content="{x:Bind ViewModel.SelectionBackgroundColor, Mode=OneWay}"
-                                    ContentTemplate="{StaticResource ColorTableEntryTemplate}"
-                                    Style="{StaticResource ColorControlStyle}" />
-                </Grid>
-            </local:SettingContainer>
+                <!--  Selection Background  -->
+                <TextBlock x:Uid="ColorScheme_SelectionBackground"
+                           Grid.Row="3"
+                           Grid.Column="4"
+                           Style="{StaticResource ColorLabelStyle}" />
+                <ContentControl x:Name="SelectionBackgroundButton"
+                                Grid.Row="3"
+                                Grid.Column="5"
+                                Content="{x:Bind ViewModel.SelectionBackgroundColor, Mode=OneWay}"
+                                ContentTemplate="{StaticResource ColorTableEntryTemplate}"
+                                Style="{StaticResource ColorControlStyle}" />
+            </Grid>
+        </local:SettingContainer>
 
-            <local:SettingContainer x:Name="SetAsDefaultContainer"
-                                    x:Uid="ColorScheme_SetAsDefault">
-                <Button x:Name="SetAsDefaultButton"
-                        x:Uid="ColorScheme_SetAsDefaultButton"
-                        Click="{x:Bind ViewModel.SetAsDefault_Click}"
-                        Style="{StaticResource BrowseButtonStyle}" />
-            </local:SettingContainer>
+        <local:SettingContainer x:Name="SetAsDefaultContainer"
+                                x:Uid="ColorScheme_SetAsDefault">
+            <Button x:Name="SetAsDefaultButton"
+                    x:Uid="ColorScheme_SetAsDefaultButton"
+                    Click="{x:Bind ViewModel.SetAsDefault_Click}"
+                    Style="{StaticResource BrowseButtonStyle}" />
+        </local:SettingContainer>
 
-            <local:SettingContainer x:Name="RenameContainer"
-                                    x:Uid="ColorScheme_Rename"
-                                    IsEnabled="{x:Bind local:Converters.InvertBoolean(ViewModel.IsInBoxScheme), Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
-                <StackPanel Orientation="Horizontal"
-                            XYFocusKeyboardNavigation="Enabled">
-                    <!--  Shown when color scheme name is already in use  -->
-                    <muxc:TeachingTip x:Name="RenameErrorTip"
-                                      x:Uid="ColorScheme_RenameErrorTip" />
-                    <!--  Name text box  -->
-                    <TextBox x:Name="NameBox"
-                             PreviewKeyDown="NameBox_PreviewKeyDown"
-                             Style="{StaticResource TextBoxSettingStyle}" />
-                    <!--  Accept rename button  -->
-                    <Button x:Name="RenameAcceptButton"
-                            x:Uid="RenameAccept"
-                            Click="RenameAccept_Click"
-                            Style="{StaticResource AccentSmallButtonStyle}">
-                        <StackPanel Orientation="Horizontal">
-                            <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                      Glyph="&#xE8FB;" />
-                        </StackPanel>
-                    </Button>
-                    <!--  Cancel rename button  -->
-                    <Button x:Name="RenameCancelButton"
-                            x:Uid="RenameCancel"
-                            Click="RenameCancel_Click"
-                            Style="{StaticResource SmallButtonStyle}">
-                        <StackPanel Orientation="Horizontal">
-                            <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                      Glyph="&#xE711;" />
-                        </StackPanel>
-                    </Button>
-                </StackPanel>
-            </local:SettingContainer>
+        <local:SettingContainer x:Name="RenameContainer"
+                                x:Uid="ColorScheme_Rename"
+                                IsEnabled="{x:Bind local:Converters.InvertBoolean(ViewModel.IsInBoxScheme), Mode=OneWay}"
+                                Style="{StaticResource ExpanderSettingContainerStyle}">
+            <StackPanel Orientation="Horizontal"
+                        XYFocusKeyboardNavigation="Enabled">
+                <!--  Shown when color scheme name is already in use  -->
+                <muxc:TeachingTip x:Name="RenameErrorTip"
+                                  x:Uid="ColorScheme_RenameErrorTip" />
+                <!--  Name text box  -->
+                <TextBox x:Name="NameBox"
+                         PreviewKeyDown="NameBox_PreviewKeyDown"
+                         Style="{StaticResource TextBoxSettingStyle}" />
+                <!--  Accept rename button  -->
+                <Button x:Name="RenameAcceptButton"
+                        x:Uid="RenameAccept"
+                        Click="RenameAccept_Click"
+                        Style="{StaticResource AccentSmallButtonStyle}">
+                    <StackPanel Orientation="Horizontal">
+                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                  Glyph="&#xE8FB;" />
+                    </StackPanel>
+                </Button>
+                <!--  Cancel rename button  -->
+                <Button x:Name="RenameCancelButton"
+                        x:Uid="RenameCancel"
+                        Click="RenameCancel_Click"
+                        Style="{StaticResource SmallButtonStyle}">
+                    <StackPanel Orientation="Horizontal">
+                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                  Glyph="&#xE711;" />
+                    </StackPanel>
+                </Button>
+            </StackPanel>
+        </local:SettingContainer>
 
-            <Grid MaxWidth="1000"
-                  Margin="2,6,0,0"
-                  ColumnSpacing="4">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <Button x:Name="DeleteButton"
-                        Grid.Column="0"
-                        IsEnabled="{x:Bind local:Converters.InvertBoolean(ViewModel.IsInBoxScheme)}"
-                        Style="{StaticResource DeleteButtonStyle}">
-                    <Button.Content>
-                        <StackPanel Orientation="Horizontal">
-                            <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                      Glyph="&#xE74D;" />
-                            <TextBlock x:Uid="ColorScheme_DeleteButton"
-                                       Style="{StaticResource IconButtonTextBlockStyle}" />
+        <Grid MaxWidth="1000"
+              Margin="2,6,0,0"
+              ColumnSpacing="4">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Button x:Name="DeleteButton"
+                    Grid.Column="0"
+                    IsEnabled="{x:Bind local:Converters.InvertBoolean(ViewModel.IsInBoxScheme)}"
+                    Style="{StaticResource DeleteButtonStyle}">
+                <Button.Content>
+                    <StackPanel Orientation="Horizontal">
+                        <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                  Glyph="&#xE74D;" />
+                        <TextBlock x:Uid="ColorScheme_DeleteButton"
+                                   Style="{StaticResource IconButtonTextBlockStyle}" />
+                    </StackPanel>
+                </Button.Content>
+                <Button.Flyout>
+                    <Flyout>
+                        <StackPanel>
+                            <TextBlock x:Uid="ColorScheme_DeleteConfirmationMessage"
+                                       Style="{StaticResource CustomFlyoutTextStyle}" />
+                            <Button x:Uid="ColorScheme_DeleteConfirmationButton"
+                                    Click="{x:Bind ViewModel.DeleteConfirmation_Click}" />
                         </StackPanel>
-                    </Button.Content>
-                    <Button.Flyout>
-                        <Flyout>
-                            <StackPanel>
-                                <TextBlock x:Uid="ColorScheme_DeleteConfirmationMessage"
-                                           Style="{StaticResource CustomFlyoutTextStyle}" />
-                                <Button x:Uid="ColorScheme_DeleteConfirmationButton"
-                                        Click="{x:Bind ViewModel.DeleteConfirmation_Click}" />
-                            </StackPanel>
-                        </Flyout>
-                    </Button.Flyout>
-                </Button>
-                <TextBlock x:Name="SelectedSchemeDisclaimer"
-                           x:Uid="ColorScheme_DeleteButtonDisclaimerInBox"
-                           Grid.Column="1"
-                           VerticalAlignment="Center"
-                           Style="{StaticResource DisclaimerStyle}"
-                           TextWrapping="Wrap"
-                           Visibility="{x:Bind ViewModel.IsInBoxScheme}" />
-            </Grid>
-        </StackPanel>
-    </ScrollViewer>
+                    </Flyout>
+                </Button.Flyout>
+            </Button>
+            <TextBlock x:Name="SelectedSchemeDisclaimer"
+                       x:Uid="ColorScheme_DeleteButtonDisclaimerInBox"
+                       Grid.Column="1"
+                       VerticalAlignment="Center"
+                       Style="{StaticResource DisclaimerStyle}"
+                       TextWrapping="Wrap"
+                       Visibility="{x:Bind ViewModel.IsInBoxScheme}" />
+        </Grid>
+    </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
index 700cfc61754..e8a3ea62900 100644
--- a/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml
@@ -25,109 +25,107 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <ScrollViewer ViewChanging="ViewChanging">
-        <StackPanel Style="{StaticResource SettingsStackStyle}">
-            <!--  Language  -->
-            <local:SettingContainer x:Uid="Globals_Language"
-                                    Visibility="{x:Bind ViewModel.LanguageSelectorAvailable}">
-                <ComboBox ItemsSource="{x:Bind ViewModel.LanguageList}"
-                          SelectedItem="{x:Bind ViewModel.CurrentLanguage, Mode=TwoWay}">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate x:DataType="x:String">
-                            <TextBlock Text="{x:Bind local:GlobalAppearanceViewModel.LanguageDisplayConverter((x:String))}" />
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
-            </local:SettingContainer>
+    <StackPanel Style="{StaticResource SettingsStackStyle}">
+        <!--  Language  -->
+        <local:SettingContainer x:Uid="Globals_Language"
+                                Visibility="{x:Bind ViewModel.LanguageSelectorAvailable}">
+            <ComboBox ItemsSource="{x:Bind ViewModel.LanguageList}"
+                      SelectedItem="{x:Bind ViewModel.CurrentLanguage, Mode=TwoWay}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate x:DataType="x:String">
+                        <TextBlock Text="{x:Bind local:GlobalAppearanceViewModel.LanguageDisplayConverter((x:String))}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+        </local:SettingContainer>
 
-            <!--  Theme  -->
-            <local:SettingContainer x:Uid="Globals_Theme">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemsSource="{x:Bind ViewModel.ThemeList, Mode=OneWay}"
-                          SelectedItem="{x:Bind ViewModel.CurrentTheme, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}">
-                    <ComboBox.ItemTemplate>
-                        <DataTemplate x:DataType="model:Theme">
-                            <TextBlock Text="{x:Bind local:GlobalAppearanceViewModel.ThemeNameConverter((model:Theme)), Mode=OneWay}" />
-                        </DataTemplate>
-                    </ComboBox.ItemTemplate>
-                </ComboBox>
-            </local:SettingContainer>
+        <!--  Theme  -->
+        <local:SettingContainer x:Uid="Globals_Theme">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemsSource="{x:Bind ViewModel.ThemeList, Mode=OneWay}"
+                      SelectedItem="{x:Bind ViewModel.CurrentTheme, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate x:DataType="model:Theme">
+                        <TextBlock Text="{x:Bind local:GlobalAppearanceViewModel.ThemeNameConverter((model:Theme)), Mode=OneWay}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+        </local:SettingContainer>
 
-            <!--  Position of new tab  -->
-            <local:SettingContainer x:Uid="Globals_NewTabPosition">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.NewTabPositionList, Mode=OneWay}"
-                          SelectedItem="{x:Bind ViewModel.CurrentNewTabPosition, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+        <!--  Position of new tab  -->
+        <local:SettingContainer x:Uid="Globals_NewTabPosition">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                      ItemsSource="{x:Bind ViewModel.NewTabPositionList, Mode=OneWay}"
+                      SelectedItem="{x:Bind ViewModel.CurrentNewTabPosition, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}" />
+        </local:SettingContainer>
 
-            <!--  Show Titlebar  -->
-            <local:SettingContainer x:Uid="Globals_ShowTitlebar">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsInTitlebar, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}"
-                              Toggled="{x:Bind ViewModel.ShowTitlebarToggled}" />
-            </local:SettingContainer>
+        <!--  Show Titlebar  -->
+        <local:SettingContainer x:Uid="Globals_ShowTitlebar">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsInTitlebar, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}"
+                          Toggled="{x:Bind ViewModel.ShowTitlebarToggled}" />
+        </local:SettingContainer>
 
-            <!--  Always show tabs  -->
-            <local:SettingContainer x:Uid="Globals_AlwaysShowTabs">
-                <ToggleSwitch IsEnabled="{x:Bind local:Converters.InvertBoolean(ViewModel.ShowTabsInTitlebar), Mode=OneWay}"
-                              IsOn="{x:Bind ViewModel.AlwaysShowTabs, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Always show tabs  -->
+        <local:SettingContainer x:Uid="Globals_AlwaysShowTabs">
+            <ToggleSwitch IsEnabled="{x:Bind local:Converters.InvertBoolean(ViewModel.ShowTabsInTitlebar), Mode=OneWay}"
+                          IsOn="{x:Bind ViewModel.AlwaysShowTabs, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Show Acrylic in Tab Row  -->
-            <local:SettingContainer x:Uid="Globals_AcrylicTabRow">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.UseAcrylicInTabRow, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Show Acrylic in Tab Row  -->
+        <local:SettingContainer x:Uid="Globals_AcrylicTabRow">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.UseAcrylicInTabRow, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Show Title in Titlebar  -->
-            <local:SettingContainer x:Uid="Globals_ShowTitleInTitlebar">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTitleInTitlebar, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Show Title in Titlebar  -->
+        <local:SettingContainer x:Uid="Globals_ShowTitleInTitlebar">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTitleInTitlebar, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Always on Top  -->
-            <local:SettingContainer x:Uid="Globals_AlwaysOnTop">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysOnTop, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Always on Top  -->
+        <local:SettingContainer x:Uid="Globals_AlwaysOnTop">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysOnTop, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Tab Width Mode  -->
-            <local:SettingContainer x:Uid="Globals_TabWidthMode">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.TabWidthModeList, Mode=OneWay}"
-                          SelectedItem="{x:Bind ViewModel.CurrentTabWidthMode, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+        <!--  Tab Width Mode  -->
+        <local:SettingContainer x:Uid="Globals_TabWidthMode">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                      ItemsSource="{x:Bind ViewModel.TabWidthModeList, Mode=OneWay}"
+                      SelectedItem="{x:Bind ViewModel.CurrentTabWidthMode, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}" />
+        </local:SettingContainer>
 
-            <!--  Disable Animations  -->
-            <!--  NOTE: the UID is "DisablePaneAnimationsReversed" not "DisablePaneAnimations". See GH#9124 for more details.  -->
-            <local:SettingContainer x:Uid="Globals_DisableAnimationsReversed">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.InvertedDisableAnimations, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Disable Animations  -->
+        <!--  NOTE: the UID is "DisablePaneAnimationsReversed" not "DisablePaneAnimations". See GH#9124 for more details.  -->
+        <local:SettingContainer x:Uid="Globals_DisableAnimationsReversed">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.InvertedDisableAnimations, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Always Show Notification Icon  -->
-            <local:SettingContainer x:Uid="Globals_AlwaysShowNotificationIcon">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysShowNotificationIcon, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Always Show Notification Icon  -->
+        <local:SettingContainer x:Uid="Globals_AlwaysShowNotificationIcon">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysShowNotificationIcon, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Minimize To Notification Area  -->
-            <local:SettingContainer x:Uid="Globals_MinimizeToNotificationArea">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.MinimizeToNotificationArea, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Minimize To Notification Area  -->
+        <local:SettingContainer x:Uid="Globals_MinimizeToNotificationArea">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.MinimizeToNotificationArea, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Automatically hide window  -->
-            <local:SettingContainer x:Uid="Globals_AutoHideWindow">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.AutoHideWindow, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-        </StackPanel>
-    </ScrollViewer>
+        <!--  Automatically hide window  -->
+        <local:SettingContainer x:Uid="Globals_AutoHideWindow">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.AutoHideWindow, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
+    </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.xaml b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
index 295a584032b..d682aaf64b3 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
@@ -24,75 +24,73 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <ScrollViewer ViewChanging="ViewChanging">
-        <StackPanel Style="{StaticResource SettingsStackStyle}">
-            <!--  Copy On Select  -->
-            <local:SettingContainer x:Uid="Globals_CopyOnSelect">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+    <StackPanel Style="{StaticResource SettingsStackStyle}">
+        <!--  Copy On Select  -->
+        <local:SettingContainer x:Uid="Globals_CopyOnSelect">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.CopyOnSelect, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Copy Format  -->
-            <local:SettingContainer x:Uid="Globals_CopyFormat">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.CopyFormatList, Mode=OneWay}"
-                          SelectedItem="{x:Bind ViewModel.CurrentCopyFormat, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+        <!--  Copy Format  -->
+        <local:SettingContainer x:Uid="Globals_CopyFormat">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                      ItemsSource="{x:Bind ViewModel.CopyFormatList, Mode=OneWay}"
+                      SelectedItem="{x:Bind ViewModel.CurrentCopyFormat, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}" />
+        </local:SettingContainer>
 
-            <!--  Trim Block Selection  -->
-            <local:SettingContainer x:Uid="Globals_TrimBlockSelection">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.TrimBlockSelection, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Trim Block Selection  -->
+        <local:SettingContainer x:Uid="Globals_TrimBlockSelection">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.TrimBlockSelection, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Trim Paste  -->
-            <local:SettingContainer x:Uid="Globals_TrimPaste">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.TrimPaste, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Trim Paste  -->
+        <local:SettingContainer x:Uid="Globals_TrimPaste">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.TrimPaste, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Word Delimiters  -->
-            <local:SettingContainer x:Uid="Globals_WordDelimiters"
-                                    CurrentValue="{x:Bind ViewModel.WordDelimiters, Mode=OneWay}"
-                                    Style="{StaticResource ExpanderSettingContainerStyle}">
-                <TextBox IsSpellCheckEnabled="False"
-                         Style="{StaticResource TextBoxSettingStyle}"
-                         Text="{x:Bind ViewModel.WordDelimiters, Mode=TwoWay}" />
-            </local:SettingContainer>
+        <!--  Word Delimiters  -->
+        <local:SettingContainer x:Uid="Globals_WordDelimiters"
+                                CurrentValue="{x:Bind ViewModel.WordDelimiters, Mode=OneWay}"
+                                Style="{StaticResource ExpanderSettingContainerStyle}">
+            <TextBox IsSpellCheckEnabled="False"
+                     Style="{StaticResource TextBoxSettingStyle}"
+                     Text="{x:Bind ViewModel.WordDelimiters, Mode=TwoWay}" />
+        </local:SettingContainer>
 
-            <!--  Snap On Resize  -->
-            <local:SettingContainer x:Uid="Globals_SnapToGridOnResize">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.SnapToGridOnResize, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Snap On Resize  -->
+        <local:SettingContainer x:Uid="Globals_SnapToGridOnResize">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.SnapToGridOnResize, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Tab Switcher Mode  -->
-            <local:SettingContainer x:Uid="Globals_TabSwitcherMode">
-                <ComboBox AutomationProperties.AccessibilityView="Content"
-                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                          ItemsSource="{x:Bind ViewModel.TabSwitcherModeList}"
-                          SelectedItem="{x:Bind ViewModel.CurrentTabSwitcherMode, Mode=TwoWay}"
-                          Style="{StaticResource ComboBoxSettingStyle}" />
-            </local:SettingContainer>
+        <!--  Tab Switcher Mode  -->
+        <local:SettingContainer x:Uid="Globals_TabSwitcherMode">
+            <ComboBox AutomationProperties.AccessibilityView="Content"
+                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                      ItemsSource="{x:Bind ViewModel.TabSwitcherModeList}"
+                      SelectedItem="{x:Bind ViewModel.CurrentTabSwitcherMode, Mode=TwoWay}"
+                      Style="{StaticResource ComboBoxSettingStyle}" />
+        </local:SettingContainer>
 
-            <!--  Focus Follow Mouse Mode  -->
-            <local:SettingContainer x:Uid="Globals_FocusFollowMouse">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.FocusFollowMouse, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Focus Follow Mouse Mode  -->
+        <local:SettingContainer x:Uid="Globals_FocusFollowMouse">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.FocusFollowMouse, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Detect URLs  -->
-            <local:SettingContainer x:Uid="Globals_DetectURLs">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.DetectURLs, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Detect URLs  -->
+        <local:SettingContainer x:Uid="Globals_DetectURLs">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.DetectURLs, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <local:SettingContainer x:Uid="Globals_ConfirmCloseAllTabs">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.ConfirmCloseAllTabs, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-        </StackPanel>
-    </ScrollViewer>
+        <local:SettingContainer x:Uid="Globals_ConfirmCloseAllTabs">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.ConfirmCloseAllTabs, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
+    </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/Launch.xaml b/src/cascadia/TerminalSettingsEditor/Launch.xaml
index 71d0827e2b3..5a30fa771d8 100644
--- a/src/cascadia/TerminalSettingsEditor/Launch.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Launch.xaml
@@ -41,244 +41,242 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <ScrollViewer ViewChanging="ViewChanging">
-        <StackPanel>
-            <StackPanel Style="{StaticResource SettingsStackStyle}">
-                <!--  Default Profile  -->
-                <local:SettingContainer x:Uid="Globals_DefaultProfile">
-                    <ComboBox x:Name="DefaultProfile"
-                              ItemsSource="{x:Bind ViewModel.DefaultProfiles}"
-                              SelectedItem="{x:Bind ViewModel.CurrentDefaultProfile, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate x:DataType="SettingsModel:Profile">
-                                <Grid HorizontalAlignment="Stretch"
-                                      ColumnSpacing="8">
+    <StackPanel>
+        <StackPanel Style="{StaticResource SettingsStackStyle}">
+            <!--  Default Profile  -->
+            <local:SettingContainer x:Uid="Globals_DefaultProfile">
+                <ComboBox x:Name="DefaultProfile"
+                          ItemsSource="{x:Bind ViewModel.DefaultProfiles}"
+                          SelectedItem="{x:Bind ViewModel.CurrentDefaultProfile, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="SettingsModel:Profile">
+                            <Grid HorizontalAlignment="Stretch"
+                                  ColumnSpacing="8">
 
-                                    <Grid.ColumnDefinitions>
-                                        <!--  icon  -->
-                                        <ColumnDefinition Width="16" />
-                                        <!--  profile name  -->
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <!--  icon  -->
+                                    <ColumnDefinition Width="16" />
+                                    <!--  profile name  -->
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
 
-                                    <IconSourceElement Grid.Column="0"
-                                                       Width="16"
-                                                       Height="16"
-                                                       IconSource="{x:Bind Icon, Converter={StaticResource IconSourceConverter}}" />
+                                <IconSourceElement Grid.Column="0"
+                                                   Width="16"
+                                                   Height="16"
+                                                   IconSource="{x:Bind Icon, Converter={StaticResource IconSourceConverter}}" />
 
-                                    <TextBlock Grid.Column="1"
-                                               Text="{x:Bind Name}" />
+                                <TextBlock Grid.Column="1"
+                                           Text="{x:Bind Name}" />
 
-                                </Grid>
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-                </local:SettingContainer>
+                            </Grid>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </local:SettingContainer>
 
-                <!--  Default Terminal  -->
-                <local:SettingContainer x:Name="DefaultTerminalDropdown"
-                                        x:Uid="Globals_DefaultTerminal"
-                                        x:Load="false">
-                    <ComboBox x:Name="DefaultTerminal"
-                              ItemsSource="{x:Bind ViewModel.DefaultTerminals}"
-                              SelectedItem="{x:Bind ViewModel.CurrentDefaultTerminal, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}">
-                        <ComboBox.ItemTemplate>
-                            <DataTemplate x:DataType="SettingsModel:DefaultTerminal">
-                                <Grid HorizontalAlignment="Stretch"
-                                      VerticalAlignment="Stretch"
-                                      ColumnSpacing="8">
+            <!--  Default Terminal  -->
+            <local:SettingContainer x:Name="DefaultTerminalDropdown"
+                                    x:Uid="Globals_DefaultTerminal"
+                                    x:Load="false">
+                <ComboBox x:Name="DefaultTerminal"
+                          ItemsSource="{x:Bind ViewModel.DefaultTerminals}"
+                          SelectedItem="{x:Bind ViewModel.CurrentDefaultTerminal, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate x:DataType="SettingsModel:DefaultTerminal">
+                            <Grid HorizontalAlignment="Stretch"
+                                  VerticalAlignment="Stretch"
+                                  ColumnSpacing="8">
 
-                                    <Grid.ColumnDefinitions>
-                                        <!--  icon  -->
-                                        <ColumnDefinition Width="auto" />
-                                        <!--  terminal name and author  -->
-                                        <ColumnDefinition Width="auto" />
-                                        <!--  version  -->
-                                        <ColumnDefinition Width="auto" />
-                                    </Grid.ColumnDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <!--  icon  -->
+                                    <ColumnDefinition Width="auto" />
+                                    <!--  terminal name and author  -->
+                                    <ColumnDefinition Width="auto" />
+                                    <!--  version  -->
+                                    <ColumnDefinition Width="auto" />
+                                </Grid.ColumnDefinitions>
 
-                                    <Grid.RowDefinitions>
-                                        <!--  terminal name  -->
-                                        <RowDefinition Height="auto" />
-                                        <!--  author and version  -->
-                                        <RowDefinition Height="auto" />
-                                    </Grid.RowDefinitions>
+                                <Grid.RowDefinitions>
+                                    <!--  terminal name  -->
+                                    <RowDefinition Height="auto" />
+                                    <!--  author and version  -->
+                                    <RowDefinition Height="auto" />
+                                </Grid.RowDefinitions>
 
-                                    <IconSourceElement Grid.Row="0"
-                                                       Grid.RowSpan="2"
-                                                       Grid.Column="0"
-                                                       Width="24"
-                                                       Height="24"
-                                                       VerticalAlignment="Center"
-                                                       IconSource="{x:Bind Icon, Converter={StaticResource IconSourceConverter}}" />
+                                <IconSourceElement Grid.Row="0"
+                                                   Grid.RowSpan="2"
+                                                   Grid.Column="0"
+                                                   Width="24"
+                                                   Height="24"
+                                                   VerticalAlignment="Center"
+                                                   IconSource="{x:Bind Icon, Converter={StaticResource IconSourceConverter}}" />
 
-                                    <TextBlock Grid.Row="0"
-                                               Grid.Column="1"
-                                               Grid.ColumnSpan="2"
-                                               AutomationProperties.AccessibilityView="Raw"
-                                               Text="{x:Bind Name}" />
+                                <TextBlock Grid.Row="0"
+                                           Grid.Column="1"
+                                           Grid.ColumnSpan="2"
+                                           AutomationProperties.AccessibilityView="Raw"
+                                           Text="{x:Bind Name}" />
 
-                                    <TextBlock Grid.Row="1"
-                                               Grid.Column="1"
-                                               AutomationProperties.AccessibilityView="Raw"
-                                               Style="{ThemeResource SecondaryTextBlockStyle}"
-                                               Text="{x:Bind Author}"
-                                               Visibility="{x:Bind local:Converters.StringNotEmptyToVisibility(Author)}" />
+                                <TextBlock Grid.Row="1"
+                                           Grid.Column="1"
+                                           AutomationProperties.AccessibilityView="Raw"
+                                           Style="{ThemeResource SecondaryTextBlockStyle}"
+                                           Text="{x:Bind Author}"
+                                           Visibility="{x:Bind local:Converters.StringNotEmptyToVisibility(Author)}" />
 
-                                    <TextBlock Grid.Row="1"
-                                               Grid.Column="2"
-                                               AutomationProperties.AccessibilityView="Raw"
-                                               Style="{ThemeResource SecondaryTextBlockStyle}"
-                                               Text="{x:Bind Version}"
-                                               Visibility="{x:Bind local:Converters.StringNotEmptyToVisibility(Version)}" />
+                                <TextBlock Grid.Row="1"
+                                           Grid.Column="2"
+                                           AutomationProperties.AccessibilityView="Raw"
+                                           Style="{ThemeResource SecondaryTextBlockStyle}"
+                                           Text="{x:Bind Version}"
+                                           Visibility="{x:Bind local:Converters.StringNotEmptyToVisibility(Version)}" />
 
-                                </Grid>
-                            </DataTemplate>
-                        </ComboBox.ItemTemplate>
-                    </ComboBox>
-                </local:SettingContainer>
+                            </Grid>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </ComboBox>
+            </local:SettingContainer>
 
-                <!--  Start on User Login  -->
-                <local:SettingContainer x:Uid="Globals_StartOnUserLogin">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.StartOnUserLogin, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Start on User Login  -->
+            <local:SettingContainer x:Uid="Globals_StartOnUserLogin">
+                <ToggleSwitch IsOn="{x:Bind ViewModel.StartOnUserLogin, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  First Window Behavior  -->
-                <local:SettingContainer x:Uid="Globals_FirstWindowPreference">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.FirstWindowPreferenceList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentFirstWindowPreference, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
+            <!--  First Window Behavior  -->
+            <local:SettingContainer x:Uid="Globals_FirstWindowPreference">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.FirstWindowPreferenceList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentFirstWindowPreference, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  Windowing Behavior  -->
-                <local:SettingContainer x:Uid="Globals_WindowingBehavior">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
+            <!--  Windowing Behavior  -->
+            <local:SettingContainer x:Uid="Globals_WindowingBehavior">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind ViewModel.WindowingBehaviorList}"
+                          SelectedItem="{x:Bind ViewModel.CurrentWindowingBehavior, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
+
+            <local:SettingContainer x:Uid="Globals_LaunchSize"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <Grid ColumnSpacing="10"
+                      RowSpacing="10">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock x:Uid="Globals_InitialCols"
+                               Grid.Row="0"
+                               Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Style="{StaticResource SettingsPageItemHeaderStyle}" />
+                    <muxc:NumberBox x:Uid="Globals_InitialColsBox"
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource LaunchSizeNumberBoxStyle}"
+                                    Value="{x:Bind ViewModel.InitialCols, Mode=TwoWay}" />
+                    <TextBlock x:Uid="Globals_InitialRows"
+                               Grid.Row="1"
+                               Grid.Column="0"
+                               VerticalAlignment="Center"
+                               Style="{StaticResource SettingsPageItemHeaderStyle}" />
+                    <muxc:NumberBox x:Uid="Globals_InitialRowsBox"
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource LaunchSizeNumberBoxStyle}"
+                                    Value="{x:Bind ViewModel.InitialRows, Mode=TwoWay}" />
+                </Grid>
+            </local:SettingContainer>
+
+            <!--  Launch Parameters  -->
+            <local:SettingContainer x:Uid="Globals_LaunchParameters"
+                                    CurrentValue="{x:Bind ViewModel.LaunchParametersCurrentValue, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <Grid RowSpacing="10">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <TextBlock x:Uid="Globals_LaunchModeSetting"
+                               Grid.Row="0"
+                               Grid.Column="0"
+                               VerticalAlignment="Center" />
+                    <ComboBox x:Name="LaunchModeComboBox"
+                              Grid.Row="0"
+                              Grid.Column="1"
+                              MinWidth="240"
+                              AutomationProperties.AccessibilityView="Content"
                               ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind ViewModel.WindowingBehaviorList}"
-                              SelectedItem="{x:Bind ViewModel.CurrentWindowingBehavior, Mode=TwoWay}"
+                              ItemsSource="{x:Bind ViewModel.LaunchModeList}"
+                              SelectedItem="{x:Bind ViewModel.CurrentLaunchMode, Mode=TwoWay}"
                               Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
-
-                <local:SettingContainer x:Uid="Globals_LaunchSize"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <Grid ColumnSpacing="10"
-                          RowSpacing="10">
+                    <TextBlock x:Uid="Globals_LaunchPosition"
+                               Grid.Row="1"
+                               Grid.Column="0"
+                               VerticalAlignment="Center" />
+                    <Grid Grid.Row="1"
+                          Grid.Column="1"
+                          ColumnSpacing="4">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
-                        <TextBlock x:Uid="Globals_InitialCols"
-                                   Grid.Row="0"
-                                   Grid.Column="0"
-                                   VerticalAlignment="Center"
-                                   Style="{StaticResource SettingsPageItemHeaderStyle}" />
-                        <muxc:NumberBox x:Uid="Globals_InitialColsBox"
+                        <!--  Match the width of these NumberBoxes to the Width of the LaunchModeComboBox above minus the Grid's ColumnSpacing  -->
+                        <muxc:NumberBox x:Name="PosXBox"
+                                        x:Uid="Globals_InitialPosXBox"
+                                        Grid.Row="0"
+                                        Grid.Column="0"
+                                        Width="118"
+                                        IsEnabled="{x:Bind local:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
+                                        Style="{StaticResource LaunchPositionNumberBoxStyle}"
+                                        Value="{x:Bind ViewModel.InitialPosX, Mode=TwoWay}" />
+                        <muxc:NumberBox x:Name="PosYBox"
+                                        x:Uid="Globals_InitialPosYBox"
                                         Grid.Row="0"
                                         Grid.Column="1"
-                                        VerticalAlignment="Center"
-                                        Style="{StaticResource LaunchSizeNumberBoxStyle}"
-                                        Value="{x:Bind ViewModel.InitialCols, Mode=TwoWay}" />
-                        <TextBlock x:Uid="Globals_InitialRows"
-                                   Grid.Row="1"
-                                   Grid.Column="0"
-                                   VerticalAlignment="Center"
-                                   Style="{StaticResource SettingsPageItemHeaderStyle}" />
-                        <muxc:NumberBox x:Uid="Globals_InitialRowsBox"
-                                        Grid.Row="1"
-                                        Grid.Column="1"
-                                        VerticalAlignment="Center"
-                                        Style="{StaticResource LaunchSizeNumberBoxStyle}"
-                                        Value="{x:Bind ViewModel.InitialRows, Mode=TwoWay}" />
+                                        Width="118"
+                                        IsEnabled="{x:Bind local:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
+                                        Style="{StaticResource LaunchPositionNumberBoxStyle}"
+                                        Value="{x:Bind ViewModel.InitialPosY, Mode=TwoWay}" />
+                        <CheckBox x:Name="UseDefaultLaunchPositionCheckbox"
+                                  x:Uid="Globals_DefaultLaunchPositionCheckbox"
+                                  Grid.Row="1"
+                                  Grid.Column="0"
+                                  Grid.ColumnSpan="2"
+                                  IsChecked="{x:Bind ViewModel.UseDefaultLaunchPosition, Mode=TwoWay}" />
                     </Grid>
-                </local:SettingContainer>
-
-                <!--  Launch Parameters  -->
-                <local:SettingContainer x:Uid="Globals_LaunchParameters"
-                                        CurrentValue="{x:Bind ViewModel.LaunchParametersCurrentValue, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <Grid RowSpacing="10">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <TextBlock x:Uid="Globals_LaunchModeSetting"
-                                   Grid.Row="0"
-                                   Grid.Column="0"
-                                   VerticalAlignment="Center" />
-                        <ComboBox x:Name="LaunchModeComboBox"
-                                  Grid.Row="0"
+                    <TextBlock x:Uid="Globals_CenterOnLaunch"
+                               Grid.Row="2"
+                               Grid.Column="0"
+                               VerticalAlignment="Center" />
+                    <ToggleSwitch x:Name="CenterOnLaunchToggle"
+                                  Grid.Row="2"
                                   Grid.Column="1"
-                                  MinWidth="240"
-                                  AutomationProperties.AccessibilityView="Content"
-                                  ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                                  ItemsSource="{x:Bind ViewModel.LaunchModeList}"
-                                  SelectedItem="{x:Bind ViewModel.CurrentLaunchMode, Mode=TwoWay}"
-                                  Style="{StaticResource ComboBoxSettingStyle}" />
-                        <TextBlock x:Uid="Globals_LaunchPosition"
-                                   Grid.Row="1"
-                                   Grid.Column="0"
-                                   VerticalAlignment="Center" />
-                        <Grid Grid.Row="1"
-                              Grid.Column="1"
-                              ColumnSpacing="4">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <!--  Match the width of these NumberBoxes to the Width of the LaunchModeComboBox above minus the Grid's ColumnSpacing  -->
-                            <muxc:NumberBox x:Name="PosXBox"
-                                            x:Uid="Globals_InitialPosXBox"
-                                            Grid.Row="0"
-                                            Grid.Column="0"
-                                            Width="118"
-                                            IsEnabled="{x:Bind local:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
-                                            Style="{StaticResource LaunchPositionNumberBoxStyle}"
-                                            Value="{x:Bind ViewModel.InitialPosX, Mode=TwoWay}" />
-                            <muxc:NumberBox x:Name="PosYBox"
-                                            x:Uid="Globals_InitialPosYBox"
-                                            Grid.Row="0"
-                                            Grid.Column="1"
-                                            Width="118"
-                                            IsEnabled="{x:Bind local:Converters.InvertBoolean(ViewModel.UseDefaultLaunchPosition), Mode=OneWay}"
-                                            Style="{StaticResource LaunchPositionNumberBoxStyle}"
-                                            Value="{x:Bind ViewModel.InitialPosY, Mode=TwoWay}" />
-                            <CheckBox x:Name="UseDefaultLaunchPositionCheckbox"
-                                      x:Uid="Globals_DefaultLaunchPositionCheckbox"
-                                      Grid.Row="1"
-                                      Grid.Column="0"
-                                      Grid.ColumnSpan="2"
-                                      IsChecked="{x:Bind ViewModel.UseDefaultLaunchPosition, Mode=TwoWay}" />
-                        </Grid>
-                        <TextBlock x:Uid="Globals_CenterOnLaunch"
-                                   Grid.Row="2"
-                                   Grid.Column="0"
-                                   VerticalAlignment="Center" />
-                        <ToggleSwitch x:Name="CenterOnLaunchToggle"
-                                      Grid.Row="2"
-                                      Grid.Column="1"
-                                      IsOn="{x:Bind ViewModel.CenterOnLaunch, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </Grid>
-                </local:SettingContainer>
-            </StackPanel>
+                                  IsOn="{x:Bind ViewModel.CenterOnLaunch, Mode=TwoWay}"
+                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                </Grid>
+            </local:SettingContainer>
         </StackPanel>
-    </ScrollViewer>
+    </StackPanel>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 2c18ce11c95..fd2ba5107a9 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -278,6 +278,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 // Don't navigate to the same page again.
                 return;
             }
+            else
+            {
+                // If we are navigating to a new page, scroll to the top
+                SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
+            }
 
             if (const auto navString = clickedItemContainer.Tag().try_as<hstring>())
             {
@@ -332,12 +337,14 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                     contentFrame().Navigate(xaml_typename<Editor::Profiles_Appearance>(), winrt::make<implementation::NavigateToProfileArgs>(profile, *this));
                     const auto crumb = winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Appearance/Header"), BreadcrumbSubPage::Profile_Appearance);
                     _breadcrumbs.Append(crumb);
+                    SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
                 }
                 else if (currentPage == ProfileSubPage::Advanced)
                 {
                     contentFrame().Navigate(xaml_typename<Editor::Profiles_Advanced>(), profile);
                     const auto crumb = winrt::make<Breadcrumb>(breadcrumbTag, RS_(L"Profile_Advanced/Header"), BreadcrumbSubPage::Profile_Advanced);
                     _breadcrumbs.Append(crumb);
+                    SettingsMainPage_ScrollViewer().ScrollToVerticalOffset(0);
                 }
             }
         });
@@ -655,6 +662,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             {
                 _Navigate(newTag.as<hstring>(), BreadcrumbSubPage::None);
             }
+            // Since we are navigating to a new profile after deletion, scroll up to the top
+            SettingsMainPage_ScrollViewer().ChangeView(nullptr, 0.0, nullptr);
         }
     }
 
diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.xaml b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
index ec690e49c9e..92931355ffa 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.xaml
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.xaml
@@ -170,18 +170,21 @@
                 <RowDefinition Height="*" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-            <Frame x:Name="contentFrame"
-                   Grid.Row="0">
-                <Frame.ContentTransitions>
-                    <TransitionCollection>
-                        <NavigationThemeTransition>
-                            <NavigationThemeTransition.DefaultNavigationTransitionInfo>
-                                <DrillInNavigationTransitionInfo />
-                            </NavigationThemeTransition.DefaultNavigationTransitionInfo>
-                        </NavigationThemeTransition>
-                    </TransitionCollection>
-                </Frame.ContentTransitions>
-            </Frame>
+            <ScrollViewer x:Name="SettingsMainPage_ScrollViewer"
+                          Grid.Row="0">
+                <Frame x:Name="contentFrame"
+                       Grid.Row="0">
+                    <Frame.ContentTransitions>
+                        <TransitionCollection>
+                            <NavigationThemeTransition>
+                                <NavigationThemeTransition.DefaultNavigationTransitionInfo>
+                                    <DrillInNavigationTransitionInfo />
+                                </NavigationThemeTransition.DefaultNavigationTransitionInfo>
+                            </NavigationThemeTransition>
+                        </TransitionCollection>
+                    </Frame.ContentTransitions>
+                </Frame>
+            </ScrollViewer>
             <!--  Explicitly set the background color on grid to prevent the navigation animation from overflowing it  -->
             <Grid Grid.Row="1"
                   Height="55"
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
index 31a93782546..77a454e554f 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Advanced.xaml
@@ -35,117 +35,114 @@
                    Margin="{StaticResource StandardIndentMargin}"
                    Style="{StaticResource DisclaimerStyle}"
                    Visibility="{x:Bind Profile.IsBaseLayer}" />
-        <ScrollViewer Grid.Row="1"
-                      ViewChanging="ViewChanging">
-            <StackPanel Style="{StaticResource SettingsStackStyle}">
-                <!--  Suppress Application Title  -->
-                <local:SettingContainer x:Uid="Profile_SuppressApplicationTitle"
-                                        ClearSettingValue="{x:Bind Profile.ClearSuppressApplicationTitle}"
-                                        HasSettingValue="{x:Bind Profile.HasSuppressApplicationTitle, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.SuppressApplicationTitleOverrideSource, Mode=OneWay}">
-                    <ToggleSwitch IsOn="{x:Bind Profile.SuppressApplicationTitle, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+        <StackPanel Style="{StaticResource SettingsStackStyle}">
+            <!--  Suppress Application Title  -->
+            <local:SettingContainer x:Uid="Profile_SuppressApplicationTitle"
+                                    ClearSettingValue="{x:Bind Profile.ClearSuppressApplicationTitle}"
+                                    HasSettingValue="{x:Bind Profile.HasSuppressApplicationTitle, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.SuppressApplicationTitleOverrideSource, Mode=OneWay}">
+                <ToggleSwitch IsOn="{x:Bind Profile.SuppressApplicationTitle, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  Antialiasing Mode  -->
-                <local:SettingContainer x:Uid="Profile_AntialiasingMode"
-                                        ClearSettingValue="{x:Bind Profile.ClearAntialiasingMode}"
-                                        HasSettingValue="{x:Bind Profile.HasAntialiasingMode, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.AntialiasingModeOverrideSource, Mode=OneWay}">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind Profile.AntiAliasingModeList, Mode=OneWay}"
-                              SelectedItem="{x:Bind Profile.CurrentAntiAliasingMode, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
+            <!--  Antialiasing Mode  -->
+            <local:SettingContainer x:Uid="Profile_AntialiasingMode"
+                                    ClearSettingValue="{x:Bind Profile.ClearAntialiasingMode}"
+                                    HasSettingValue="{x:Bind Profile.HasAntialiasingMode, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.AntialiasingModeOverrideSource, Mode=OneWay}">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind Profile.AntiAliasingModeList, Mode=OneWay}"
+                          SelectedItem="{x:Bind Profile.CurrentAntiAliasingMode, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  AltGr Aliasing  -->
-                <local:SettingContainer x:Uid="Profile_AltGrAliasing"
-                                        ClearSettingValue="{x:Bind Profile.ClearAltGrAliasing}"
-                                        HasSettingValue="{x:Bind Profile.HasAltGrAliasing, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.AltGrAliasingOverrideSource, Mode=OneWay}">
-                    <ToggleSwitch IsOn="{x:Bind Profile.AltGrAliasing, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  AltGr Aliasing  -->
+            <local:SettingContainer x:Uid="Profile_AltGrAliasing"
+                                    ClearSettingValue="{x:Bind Profile.ClearAltGrAliasing}"
+                                    HasSettingValue="{x:Bind Profile.HasAltGrAliasing, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.AltGrAliasingOverrideSource, Mode=OneWay}">
+                <ToggleSwitch IsOn="{x:Bind Profile.AltGrAliasing, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  Snap On Input  -->
-                <local:SettingContainer x:Uid="Profile_SnapOnInput"
-                                        ClearSettingValue="{x:Bind Profile.ClearSnapOnInput}"
-                                        HasSettingValue="{x:Bind Profile.HasSnapOnInput, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.SnapOnInputOverrideSource, Mode=OneWay}">
-                    <ToggleSwitch IsOn="{x:Bind Profile.SnapOnInput, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Snap On Input  -->
+            <local:SettingContainer x:Uid="Profile_SnapOnInput"
+                                    ClearSettingValue="{x:Bind Profile.ClearSnapOnInput}"
+                                    HasSettingValue="{x:Bind Profile.HasSnapOnInput, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.SnapOnInputOverrideSource, Mode=OneWay}">
+                <ToggleSwitch IsOn="{x:Bind Profile.SnapOnInput, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  History Size  -->
-                <local:SettingContainer x:Uid="Profile_HistorySize"
-                                        ClearSettingValue="{x:Bind Profile.ClearHistorySize}"
-                                        HasSettingValue="{x:Bind Profile.HasHistorySize, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.HistorySizeOverrideSource, Mode=OneWay}">
-                    <muxc:NumberBox x:Uid="Profile_HistorySizeBox"
-                                    LargeChange="100"
-                                    Minimum="0"
-                                    SmallChange="10"
-                                    Style="{StaticResource NumberBoxSettingStyle}"
-                                    Value="{x:Bind Profile.HistorySize, Mode=TwoWay}" />
-                </local:SettingContainer>
+            <!--  History Size  -->
+            <local:SettingContainer x:Uid="Profile_HistorySize"
+                                    ClearSettingValue="{x:Bind Profile.ClearHistorySize}"
+                                    HasSettingValue="{x:Bind Profile.HasHistorySize, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.HistorySizeOverrideSource, Mode=OneWay}">
+                <muxc:NumberBox x:Uid="Profile_HistorySizeBox"
+                                LargeChange="100"
+                                Minimum="0"
+                                SmallChange="10"
+                                Style="{StaticResource NumberBoxSettingStyle}"
+                                Value="{x:Bind Profile.HistorySize, Mode=TwoWay}" />
+            </local:SettingContainer>
 
-                <!--  Close On Exit  -->
-                <local:SettingContainer x:Uid="Profile_CloseOnExit"
-                                        ClearSettingValue="{x:Bind Profile.ClearCloseOnExit}"
-                                        HasSettingValue="{x:Bind Profile.HasCloseOnExit, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.CloseOnExitOverrideSource, Mode=OneWay}">
-                    <ComboBox AutomationProperties.AccessibilityView="Content"
-                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                              ItemsSource="{x:Bind Profile.CloseOnExitModeList, Mode=OneWay}"
-                              SelectedItem="{x:Bind Profile.CurrentCloseOnExitMode, Mode=TwoWay}"
-                              Style="{StaticResource ComboBoxSettingStyle}" />
-                </local:SettingContainer>
+            <!--  Close On Exit  -->
+            <local:SettingContainer x:Uid="Profile_CloseOnExit"
+                                    ClearSettingValue="{x:Bind Profile.ClearCloseOnExit}"
+                                    HasSettingValue="{x:Bind Profile.HasCloseOnExit, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.CloseOnExitOverrideSource, Mode=OneWay}">
+                <ComboBox AutomationProperties.AccessibilityView="Content"
+                          ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                          ItemsSource="{x:Bind Profile.CloseOnExitModeList, Mode=OneWay}"
+                          SelectedItem="{x:Bind Profile.CurrentCloseOnExitMode, Mode=TwoWay}"
+                          Style="{StaticResource ComboBoxSettingStyle}" />
+            </local:SettingContainer>
 
-                <!--  Bell Style  -->
-                <local:SettingContainer x:Uid="Profile_BellStyle"
-                                        ClearSettingValue="{x:Bind Profile.ClearBellStyle}"
-                                        HasSettingValue="{x:Bind Profile.HasBellStyle, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.BellStyleOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <StackPanel>
-                        <CheckBox x:Uid="Profile_BellStyleAudible"
-                                  IsChecked="{x:Bind Profile.IsBellStyleFlagSet(1), BindBack=Profile.SetBellStyleAudible, Mode=TwoWay}" />
-                        <CheckBox x:Uid="Profile_BellStyleWindow"
-                                  IsChecked="{x:Bind Profile.IsBellStyleFlagSet(2), BindBack=Profile.SetBellStyleWindow, Mode=TwoWay}" />
-                        <CheckBox x:Uid="Profile_BellStyleTaskbar"
-                                  IsChecked="{x:Bind Profile.IsBellStyleFlagSet(4), BindBack=Profile.SetBellStyleTaskbar, Mode=TwoWay}" />
-                    </StackPanel>
-                </local:SettingContainer>
+            <!--  Bell Style  -->
+            <local:SettingContainer x:Uid="Profile_BellStyle"
+                                    ClearSettingValue="{x:Bind Profile.ClearBellStyle}"
+                                    HasSettingValue="{x:Bind Profile.HasBellStyle, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.BellStyleOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <StackPanel>
+                    <CheckBox x:Uid="Profile_BellStyleAudible"
+                              IsChecked="{x:Bind Profile.IsBellStyleFlagSet(1), BindBack=Profile.SetBellStyleAudible, Mode=TwoWay}" />
+                    <CheckBox x:Uid="Profile_BellStyleWindow"
+                              IsChecked="{x:Bind Profile.IsBellStyleFlagSet(2), BindBack=Profile.SetBellStyleWindow, Mode=TwoWay}" />
+                    <CheckBox x:Uid="Profile_BellStyleTaskbar"
+                              IsChecked="{x:Bind Profile.IsBellStyleFlagSet(4), BindBack=Profile.SetBellStyleTaskbar, Mode=TwoWay}" />
+                </StackPanel>
+            </local:SettingContainer>
 
-                <!--  AtlasEngine  -->
-                <local:SettingContainer x:Uid="Profile_UseAtlasEngine"
-                                        ClearSettingValue="{x:Bind Profile.ClearUseAtlasEngine}"
-                                        HasSettingValue="{x:Bind Profile.HasUseAtlasEngine, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.UseAtlasEngineOverrideSource, Mode=OneWay}">
-                    <ToggleSwitch IsOn="{x:Bind Profile.UseAtlasEngine, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  AtlasEngine  -->
+            <local:SettingContainer x:Uid="Profile_UseAtlasEngine"
+                                    ClearSettingValue="{x:Bind Profile.ClearUseAtlasEngine}"
+                                    HasSettingValue="{x:Bind Profile.HasUseAtlasEngine, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.UseAtlasEngineOverrideSource, Mode=OneWay}">
+                <ToggleSwitch IsOn="{x:Bind Profile.UseAtlasEngine, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  VtPassthrough  -->
-                <local:SettingContainer x:Uid="Profile_VtPassthrough"
-                                        ClearSettingValue="{x:Bind Profile.ClearVtPassthrough}"
-                                        HasSettingValue="{x:Bind Profile.HasVtPassthrough, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.VtPassthroughOverrideSource, Mode=OneWay}"
-                                        Visibility="{x:Bind Profile.VtPassthroughAvailable}">
-                    <ToggleSwitch IsOn="{x:Bind Profile.VtPassthrough, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  VtPassthrough  -->
+            <local:SettingContainer x:Uid="Profile_VtPassthrough"
+                                    ClearSettingValue="{x:Bind Profile.ClearVtPassthrough}"
+                                    HasSettingValue="{x:Bind Profile.HasVtPassthrough, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.VtPassthroughOverrideSource, Mode=OneWay}"
+                                    Visibility="{x:Bind Profile.VtPassthroughAvailable}">
+                <ToggleSwitch IsOn="{x:Bind Profile.VtPassthrough, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <!--  ReloadEnvVars  -->
-                <local:SettingContainer x:Uid="Profile_ReloadEnvVars"
-                                        ClearSettingValue="{x:Bind Profile.ClearReloadEnvironmentVariables}"
-                                        HasSettingValue="{x:Bind Profile.HasReloadEnvironmentVariables, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.ReloadEnvironmentVariablesOverrideSource, Mode=OneWay}">
-                    <ToggleSwitch IsOn="{x:Bind Profile.ReloadEnvironmentVariables, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
-            </StackPanel>
-        </ScrollViewer>
+            <!--  ReloadEnvVars  -->
+            <local:SettingContainer x:Uid="Profile_ReloadEnvVars"
+                                    ClearSettingValue="{x:Bind Profile.ClearReloadEnvironmentVariables}"
+                                    HasSettingValue="{x:Bind Profile.HasReloadEnvironmentVariables, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.ReloadEnvironmentVariablesOverrideSource, Mode=OneWay}">
+                <ToggleSwitch IsOn="{x:Bind Profile.ReloadEnvironmentVariables, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
+        </StackPanel>
     </Grid>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
index 710eb62ee16..806125785e8 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Appearance.xaml
@@ -41,144 +41,141 @@
                    Margin="{StaticResource StandardIndentMargin}"
                    Style="{StaticResource DisclaimerStyle}"
                    Visibility="{x:Bind Profile.IsBaseLayer}" />
-        <ScrollViewer Grid.Row="1"
-                      ViewChanging="ViewChanging">
-            <StackPanel Style="{StaticResource SettingsStackStyle}">
-                <!--  Control Preview  -->
-                <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
-                    <Border x:Name="ControlPreview"
-                            Width="400"
-                            Height="180"
-                            Margin="0,0,0,12"
-                            HorizontalAlignment="Left"
-                            BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
-                            BorderThickness="1" />
-                </Border>
+        <StackPanel Style="{StaticResource SettingsStackStyle}">
+            <!--  Control Preview  -->
+            <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
+                <Border x:Name="ControlPreview"
+                        Width="400"
+                        Height="180"
+                        Margin="0,0,0,12"
+                        HorizontalAlignment="Left"
+                        BorderBrush="{ThemeResource SystemControlForegroundBaseMediumLowBrush}"
+                        BorderThickness="1" />
+            </Border>
 
-                <local:Appearances Appearance="{x:Bind Profile.DefaultAppearance, Mode=OneWay}"
-                                   SourceProfile="{x:Bind Profile, Mode=OneWay}"
-                                   WindowRoot="{x:Bind WindowRoot, Mode=OneTime}" />
-
-                <!--  Grouping: Transparency  -->
-                <StackPanel Style="{StaticResource PivotStackStyle}">
-                    <TextBlock x:Uid="Profile_TransparencyHeader"
-                               Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <local:Appearances Appearance="{x:Bind Profile.DefaultAppearance, Mode=OneWay}"
+                               SourceProfile="{x:Bind Profile, Mode=OneWay}"
+                               WindowRoot="{x:Bind WindowRoot, Mode=OneTime}" />
 
-                    <!--  Opacity  -->
-                    <local:SettingContainer x:Name="OpacityContainer"
-                                            x:Uid="Profile_Opacity"
-                                            ClearSettingValue="{x:Bind Profile.ClearOpacity}"
-                                            HasSettingValue="{x:Bind Profile.HasOpacity, Mode=OneWay}"
-                                            SettingOverrideSource="{x:Bind Profile.OpacityOverrideSource, Mode=OneWay}">
-                        <StackPanel x:Name="OpacityControl">
-                            <Grid Style="{StaticResource CustomSliderControlGridStyle}">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <Slider x:Name="OpacitySlider"
-                                        x:Uid="Profile_OpacitySlider"
-                                        Grid.Column="0"
-                                        Value="{x:Bind local:Converters.PercentageToPercentageValue(Profile.Opacity), BindBack=Profile.SetAcrylicOpacityPercentageValue, Mode=TwoWay}" />
-                                <TextBlock Grid.Column="1"
-                                           Style="{StaticResource SliderValueLabelStyle}"
-                                           Text="{x:Bind local:Converters.AppendPercentageSign(OpacitySlider.Value), Mode=OneWay}" />
-                            </Grid>
-                        </StackPanel>
-                    </local:SettingContainer>
+            <!--  Grouping: Transparency  -->
+            <StackPanel Style="{StaticResource PivotStackStyle}">
+                <TextBlock x:Uid="Profile_TransparencyHeader"
+                           Style="{StaticResource TextBlockSubHeaderStyle}" />
 
-                    <!--  Use Acrylic  -->
-                    <local:SettingContainer x:Uid="Profile_UseAcrylic"
-                                            ClearSettingValue="{x:Bind Profile.ClearUseAcrylic}"
-                                            HasSettingValue="{x:Bind Profile.HasUseAcrylic, Mode=OneWay}"
-                                            SettingOverrideSource="{x:Bind Profile.UseAcrylicOverrideSource, Mode=OneWay}">
-                        <ToggleSwitch x:Name="UseAcrylicToggleSwitch"
-                                      IsOn="{x:Bind Profile.UseAcrylic, Mode=TwoWay}"
-                                      Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                    </local:SettingContainer>
-
-                </StackPanel>
-
-                <!--  Grouping: Window  -->
-                <StackPanel Style="{StaticResource PivotStackStyle}">
-                    <TextBlock x:Uid="Profile_WindowHeader"
-                               Style="{StaticResource TextBlockSubHeaderStyle}" />
-
-                    <!--  Padding  -->
-                    <local:SettingContainer x:Uid="Profile_Padding"
-                                            ClearSettingValue="{x:Bind Profile.ClearPadding}"
-                                            HasSettingValue="{x:Bind Profile.HasPadding, Mode=OneWay}"
-                                            SettingOverrideSource="{x:Bind Profile.PaddingOverrideSource, Mode=OneWay}">
+                <!--  Opacity  -->
+                <local:SettingContainer x:Name="OpacityContainer"
+                                        x:Uid="Profile_Opacity"
+                                        ClearSettingValue="{x:Bind Profile.ClearOpacity}"
+                                        HasSettingValue="{x:Bind Profile.HasOpacity, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind Profile.OpacityOverrideSource, Mode=OneWay}">
+                    <StackPanel x:Name="OpacityControl">
                         <Grid Style="{StaticResource CustomSliderControlGridStyle}">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
-                            <Slider x:Name="PaddingSlider"
-                                    x:Uid="Profile_PaddingSlider"
+                            <Slider x:Name="OpacitySlider"
+                                    x:Uid="Profile_OpacitySlider"
                                     Grid.Column="0"
-                                    Value="{x:Bind local:Converters.MaxValueFromPaddingString(Profile.Padding), BindBack=Profile.SetPadding, Mode=TwoWay}" />
+                                    Value="{x:Bind local:Converters.PercentageToPercentageValue(Profile.Opacity), BindBack=Profile.SetAcrylicOpacityPercentageValue, Mode=TwoWay}" />
                             <TextBlock Grid.Column="1"
                                        Style="{StaticResource SliderValueLabelStyle}"
-                                       Text="{Binding ElementName=PaddingSlider, Path=Value, Mode=OneWay}" />
+                                       Text="{x:Bind local:Converters.AppendPercentageSign(OpacitySlider.Value), Mode=OneWay}" />
                         </Grid>
-                    </local:SettingContainer>
-
-                    <!--  Scrollbar Visibility  -->
-                    <local:SettingContainer x:Uid="Profile_ScrollbarVisibility"
-                                            ClearSettingValue="{x:Bind Profile.ClearScrollState}"
-                                            HasSettingValue="{x:Bind Profile.HasScrollState, Mode=OneWay}"
-                                            SettingOverrideSource="{x:Bind Profile.ScrollStateOverrideSource, Mode=OneWay}">
-                        <ComboBox AutomationProperties.AccessibilityView="Content"
-                                  ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                                  ItemsSource="{x:Bind Profile.ScrollStateList, Mode=OneWay}"
-                                  SelectedItem="{x:Bind Profile.CurrentScrollState, Mode=TwoWay}"
-                                  Style="{StaticResource ComboBoxSettingStyle}" />
-                    </local:SettingContainer>
-                </StackPanel>
-                <StackPanel MaxWidth="{StaticResource StandardControlMaxWidth}">
-                    <StackPanel Orientation="Horizontal"
-                                Visibility="{x:Bind Profile.EditableUnfocusedAppearance, Mode=OneWay}">
-                        <TextBlock x:Uid="Profile_UnfocusedAppearanceTextBlock"
-                                   Style="{StaticResource TitleTextBlockStyle}" />
-                        <Button x:Uid="Profile_CreateUnfocusedAppearanceButton"
-                                Margin="10,0,0,0"
-                                Click="CreateUnfocusedAppearance_Click"
-                                Style="{StaticResource BaseButtonStyle}"
-                                Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(Profile.HasUnfocusedAppearance), Mode=OneWay}">
-                            <Button.Content>
-                                <StackPanel Orientation="Horizontal">
-                                    <FontIcon Margin="0,3,0,0"
-                                              FontSize="{StaticResource StandardIconSize}"
-                                              Glyph="&#xE710;" />
-                                    <TextBlock x:Uid="Profile_AddAppearanceButton"
-                                               Margin="10,0,0,0"
-                                               FontSize="{StaticResource StandardIconSize}" />
-                                </StackPanel>
-                            </Button.Content>
-                        </Button>
-                        <Button x:Uid="Profile_DeleteUnfocusedAppearanceButton"
-                                Margin="10,0,0,0"
-                                Click="DeleteUnfocusedAppearance_Click"
-                                Style="{StaticResource DeleteButtonStyle}"
-                                Visibility="{x:Bind Profile.HasUnfocusedAppearance, Mode=OneWay}">
-                            <Button.Content>
-                                <StackPanel Orientation="Horizontal">
-                                    <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                              Glyph="&#xE74D;" />
-                                    <TextBlock x:Uid="Profile_DeleteAppearanceButton"
-                                               Margin="10,0,0,0"
-                                               FontSize="{StaticResource StandardIconSize}" />
-                                </StackPanel>
-                            </Button.Content>
-                        </Button>
                     </StackPanel>
-                    <local:Appearances Appearance="{x:Bind Profile.UnfocusedAppearance, Mode=OneWay}"
-                                       SourceProfile="{x:Bind Profile, Mode=OneWay}"
-                                       Visibility="{x:Bind Profile.ShowUnfocusedAppearance, Mode=OneWay}"
-                                       WindowRoot="{x:Bind WindowRoot, Mode=OneTime}" />
+                </local:SettingContainer>
+
+                <!--  Use Acrylic  -->
+                <local:SettingContainer x:Uid="Profile_UseAcrylic"
+                                        ClearSettingValue="{x:Bind Profile.ClearUseAcrylic}"
+                                        HasSettingValue="{x:Bind Profile.HasUseAcrylic, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind Profile.UseAcrylicOverrideSource, Mode=OneWay}">
+                    <ToggleSwitch x:Name="UseAcrylicToggleSwitch"
+                                  IsOn="{x:Bind Profile.UseAcrylic, Mode=TwoWay}"
+                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+                </local:SettingContainer>
+
+            </StackPanel>
+
+            <!--  Grouping: Window  -->
+            <StackPanel Style="{StaticResource PivotStackStyle}">
+                <TextBlock x:Uid="Profile_WindowHeader"
+                           Style="{StaticResource TextBlockSubHeaderStyle}" />
+
+                <!--  Padding  -->
+                <local:SettingContainer x:Uid="Profile_Padding"
+                                        ClearSettingValue="{x:Bind Profile.ClearPadding}"
+                                        HasSettingValue="{x:Bind Profile.HasPadding, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind Profile.PaddingOverrideSource, Mode=OneWay}">
+                    <Grid Style="{StaticResource CustomSliderControlGridStyle}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Slider x:Name="PaddingSlider"
+                                x:Uid="Profile_PaddingSlider"
+                                Grid.Column="0"
+                                Value="{x:Bind local:Converters.MaxValueFromPaddingString(Profile.Padding), BindBack=Profile.SetPadding, Mode=TwoWay}" />
+                        <TextBlock Grid.Column="1"
+                                   Style="{StaticResource SliderValueLabelStyle}"
+                                   Text="{Binding ElementName=PaddingSlider, Path=Value, Mode=OneWay}" />
+                    </Grid>
+                </local:SettingContainer>
+
+                <!--  Scrollbar Visibility  -->
+                <local:SettingContainer x:Uid="Profile_ScrollbarVisibility"
+                                        ClearSettingValue="{x:Bind Profile.ClearScrollState}"
+                                        HasSettingValue="{x:Bind Profile.HasScrollState, Mode=OneWay}"
+                                        SettingOverrideSource="{x:Bind Profile.ScrollStateOverrideSource, Mode=OneWay}">
+                    <ComboBox AutomationProperties.AccessibilityView="Content"
+                              ItemTemplate="{StaticResource EnumComboBoxTemplate}"
+                              ItemsSource="{x:Bind Profile.ScrollStateList, Mode=OneWay}"
+                              SelectedItem="{x:Bind Profile.CurrentScrollState, Mode=TwoWay}"
+                              Style="{StaticResource ComboBoxSettingStyle}" />
+                </local:SettingContainer>
+            </StackPanel>
+            <StackPanel MaxWidth="{StaticResource StandardControlMaxWidth}">
+                <StackPanel Orientation="Horizontal"
+                            Visibility="{x:Bind Profile.EditableUnfocusedAppearance, Mode=OneWay}">
+                    <TextBlock x:Uid="Profile_UnfocusedAppearanceTextBlock"
+                               Style="{StaticResource TitleTextBlockStyle}" />
+                    <Button x:Uid="Profile_CreateUnfocusedAppearanceButton"
+                            Margin="10,0,0,0"
+                            Click="CreateUnfocusedAppearance_Click"
+                            Style="{StaticResource BaseButtonStyle}"
+                            Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(Profile.HasUnfocusedAppearance), Mode=OneWay}">
+                        <Button.Content>
+                            <StackPanel Orientation="Horizontal">
+                                <FontIcon Margin="0,3,0,0"
+                                          FontSize="{StaticResource StandardIconSize}"
+                                          Glyph="&#xE710;" />
+                                <TextBlock x:Uid="Profile_AddAppearanceButton"
+                                           Margin="10,0,0,0"
+                                           FontSize="{StaticResource StandardIconSize}" />
+                            </StackPanel>
+                        </Button.Content>
+                    </Button>
+                    <Button x:Uid="Profile_DeleteUnfocusedAppearanceButton"
+                            Margin="10,0,0,0"
+                            Click="DeleteUnfocusedAppearance_Click"
+                            Style="{StaticResource DeleteButtonStyle}"
+                            Visibility="{x:Bind Profile.HasUnfocusedAppearance, Mode=OneWay}">
+                        <Button.Content>
+                            <StackPanel Orientation="Horizontal">
+                                <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                          Glyph="&#xE74D;" />
+                                <TextBlock x:Uid="Profile_DeleteAppearanceButton"
+                                           Margin="10,0,0,0"
+                                           FontSize="{StaticResource StandardIconSize}" />
+                            </StackPanel>
+                        </Button.Content>
+                    </Button>
                 </StackPanel>
+                <local:Appearances Appearance="{x:Bind Profile.UnfocusedAppearance, Mode=OneWay}"
+                                   SourceProfile="{x:Bind Profile, Mode=OneWay}"
+                                   Visibility="{x:Bind Profile.ShowUnfocusedAppearance, Mode=OneWay}"
+                                   WindowRoot="{x:Bind WindowRoot, Mode=OneTime}" />
             </StackPanel>
-        </ScrollViewer>
+        </StackPanel>
     </Grid>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp b/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
index 32570a016b7..b181ef80c9f 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.cpp
@@ -52,7 +52,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             {
                 DeleteButton().Focus(FocusState::Programmatic);
                 _Profile.FocusDeleteButton(false);
-                ProfilesBase_ScrollView().ChangeView(nullptr, ProfilesBase_ScrollView().ScrollableHeight(), nullptr);
             }
         });
     }
diff --git a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
index f660f40ed90..de83675532f 100644
--- a/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Profiles_Base.xaml
@@ -31,165 +31,161 @@
                    Margin="{StaticResource StandardIndentMargin}"
                    Style="{StaticResource DisclaimerStyle}"
                    Visibility="{x:Bind Profile.IsBaseLayer}" />
-        <ScrollViewer Name="ProfilesBase_ScrollView"
-                      Grid.Row="1"
-                      ViewChanging="ViewChanging">
-            <StackPanel Style="{StaticResource SettingsStackStyle}">
+        <StackPanel Style="{StaticResource SettingsStackStyle}">
 
-                <!--  Name  -->
-                <!--
-                    NOTE: Has/Clear is not bound because we don't want the reset button & override text to appear.
-                    Additionally, the JSON stubs generated by auto-generated profiles come with a name,
-                    so the name will always be overridden.
-                -->
-                <local:SettingContainer x:Uid="Profile_Name"
-                                        CurrentValue="{x:Bind Profile.Name, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}"
-                                        Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
-                    <TextBox Style="{StaticResource TextBoxSettingStyle}"
-                             Text="{x:Bind Profile.Name, Mode=TwoWay}" />
-                </local:SettingContainer>
+            <!--  Name  -->
+            <!--
+                NOTE: Has/Clear is not bound because we don't want the reset button & override text to appear.
+                Additionally, the JSON stubs generated by auto-generated profiles come with a name,
+                so the name will always be overridden.
+            -->
+            <local:SettingContainer x:Uid="Profile_Name"
+                                    CurrentValue="{x:Bind Profile.Name, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}"
+                                    Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
+                <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                         Text="{x:Bind Profile.Name, Mode=TwoWay}" />
+            </local:SettingContainer>
 
-                <!--  Commandline  -->
-                <local:SettingContainer x:Name="CommandlineContainer"
-                                        x:Uid="Profile_Commandline"
-                                        ClearSettingValue="{x:Bind Profile.ClearCommandline}"
-                                        CurrentValue="{x:Bind Profile.Commandline, Mode=OneWay}"
-                                        HasSettingValue="{x:Bind Profile.HasCommandline, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.CommandlineOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}"
-                                        Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
-                    <StackPanel>
-                        <TextBox x:Uid="Profile_CommandlineBox"
-                                 IsSpellCheckEnabled="False"
-                                 Style="{StaticResource TextBoxSettingStyle}"
-                                 Text="{x:Bind Profile.Commandline, Mode=TwoWay}" />
-                        <Button x:Uid="Profile_CommandlineBrowse"
-                                Margin="0,10,0,0"
-                                Click="Commandline_Click"
-                                Style="{StaticResource BrowseButtonStyle}" />
-                    </StackPanel>
-                </local:SettingContainer>
-
-                <!--  Starting Directory  -->
-                <local:SettingContainer x:Name="StartingDirectoryContainer"
-                                        x:Uid="Profile_StartingDirectory"
-                                        ClearSettingValue="{x:Bind Profile.ClearStartingDirectory}"
-                                        CurrentValue="{x:Bind Profile.StartingDirectory, Mode=OneWay}"
-                                        HasSettingValue="{x:Bind Profile.HasStartingDirectory, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.StartingDirectoryOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <StackPanel Orientation="Vertical">
-                        <TextBox x:Uid="Profile_StartingDirectoryBox"
-                                 IsEnabled="{x:Bind Profile.UseCustomStartingDirectory, Mode=OneWay}"
-                                 IsSpellCheckEnabled="False"
-                                 Style="{StaticResource TextBoxSettingStyle}"
-                                 Text="{x:Bind Profile.StartingDirectory, Mode=TwoWay}" />
-                        <StackPanel Orientation="Horizontal">
-                            <Button x:Name="StartingDirectoryBrowse"
-                                    x:Uid="Profile_StartingDirectoryBrowse"
-                                    Margin="0,10,10,0"
-                                    Click="StartingDirectory_Click"
-                                    IsEnabled="{x:Bind Profile.UseCustomStartingDirectory, Mode=OneWay}"
-                                    Style="{StaticResource BrowseButtonStyle}" />
-                            <CheckBox x:Name="StartingDirectoryUseParentCheckbox"
-                                      x:Uid="Profile_StartingDirectoryUseParentCheckbox"
-                                      Margin="0,5,0,0"
-                                      IsChecked="{x:Bind Profile.UseParentProcessDirectory, Mode=TwoWay}" />
-                        </StackPanel>
-                    </StackPanel>
-                </local:SettingContainer>
+            <!--  Commandline  -->
+            <local:SettingContainer x:Name="CommandlineContainer"
+                                    x:Uid="Profile_Commandline"
+                                    ClearSettingValue="{x:Bind Profile.ClearCommandline}"
+                                    CurrentValue="{x:Bind Profile.Commandline, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Profile.HasCommandline, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.CommandlineOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}"
+                                    Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
+                <StackPanel>
+                    <TextBox x:Uid="Profile_CommandlineBox"
+                             IsSpellCheckEnabled="False"
+                             Style="{StaticResource TextBoxSettingStyle}"
+                             Text="{x:Bind Profile.Commandline, Mode=TwoWay}" />
+                    <Button x:Uid="Profile_CommandlineBrowse"
+                            Margin="0,10,0,0"
+                            Click="Commandline_Click"
+                            Style="{StaticResource BrowseButtonStyle}" />
+                </StackPanel>
+            </local:SettingContainer>
 
-                <!--  Icon  -->
-                <local:SettingContainer x:Uid="Profile_Icon"
-                                        ClearSettingValue="{x:Bind Profile.ClearIcon}"
-                                        CurrentValue="{x:Bind Profile.Icon, Mode=OneWay}"
-                                        HasSettingValue="{x:Bind Profile.HasIcon, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.IconOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <StackPanel>
-                        <TextBox x:Uid="Profile_IconBox"
-                                 FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
-                                 IsSpellCheckEnabled="False"
-                                 Style="{StaticResource TextBoxSettingStyle}"
-                                 Text="{x:Bind Profile.Icon, Mode=TwoWay}" />
-                        <Button x:Uid="Profile_IconBrowse"
-                                Margin="0,10,0,0"
-                                Click="Icon_Click"
+            <!--  Starting Directory  -->
+            <local:SettingContainer x:Name="StartingDirectoryContainer"
+                                    x:Uid="Profile_StartingDirectory"
+                                    ClearSettingValue="{x:Bind Profile.ClearStartingDirectory}"
+                                    CurrentValue="{x:Bind Profile.StartingDirectory, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Profile.HasStartingDirectory, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.StartingDirectoryOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <StackPanel Orientation="Vertical">
+                    <TextBox x:Uid="Profile_StartingDirectoryBox"
+                             IsEnabled="{x:Bind Profile.UseCustomStartingDirectory, Mode=OneWay}"
+                             IsSpellCheckEnabled="False"
+                             Style="{StaticResource TextBoxSettingStyle}"
+                             Text="{x:Bind Profile.StartingDirectory, Mode=TwoWay}" />
+                    <StackPanel Orientation="Horizontal">
+                        <Button x:Name="StartingDirectoryBrowse"
+                                x:Uid="Profile_StartingDirectoryBrowse"
+                                Margin="0,10,10,0"
+                                Click="StartingDirectory_Click"
+                                IsEnabled="{x:Bind Profile.UseCustomStartingDirectory, Mode=OneWay}"
                                 Style="{StaticResource BrowseButtonStyle}" />
+                        <CheckBox x:Name="StartingDirectoryUseParentCheckbox"
+                                  x:Uid="Profile_StartingDirectoryUseParentCheckbox"
+                                  Margin="0,5,0,0"
+                                  IsChecked="{x:Bind Profile.UseParentProcessDirectory, Mode=TwoWay}" />
                     </StackPanel>
-                </local:SettingContainer>
+                </StackPanel>
+            </local:SettingContainer>
 
-                <!--  Tab Title  -->
-                <local:SettingContainer x:Uid="Profile_TabTitle"
-                                        ClearSettingValue="{x:Bind Profile.ClearTabTitle}"
-                                        CurrentValue="{x:Bind Profile.TabTitle, Mode=OneWay}"
-                                        HasSettingValue="{x:Bind Profile.HasTabTitle, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.TabTitleOverrideSource, Mode=OneWay}"
-                                        Style="{StaticResource ExpanderSettingContainerStyle}">
-                    <TextBox Style="{StaticResource TextBoxSettingStyle}"
-                             Text="{x:Bind Profile.TabTitle, Mode=TwoWay}" />
-                </local:SettingContainer>
+            <!--  Icon  -->
+            <local:SettingContainer x:Uid="Profile_Icon"
+                                    ClearSettingValue="{x:Bind Profile.ClearIcon}"
+                                    CurrentValue="{x:Bind Profile.Icon, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Profile.HasIcon, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.IconOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <StackPanel>
+                    <TextBox x:Uid="Profile_IconBox"
+                             FontFamily="Segoe UI, Segoe Fluent Icons, Segoe MDL2 Assets"
+                             IsSpellCheckEnabled="False"
+                             Style="{StaticResource TextBoxSettingStyle}"
+                             Text="{x:Bind Profile.Icon, Mode=TwoWay}" />
+                    <Button x:Uid="Profile_IconBrowse"
+                            Margin="0,10,0,0"
+                            Click="Icon_Click"
+                            Style="{StaticResource BrowseButtonStyle}" />
+                </StackPanel>
+            </local:SettingContainer>
 
-                <!--  Elevate  -->
-                <local:SettingContainer x:Uid="Profile_Elevate"
-                                        ClearSettingValue="{x:Bind Profile.ClearElevate}"
-                                        HasSettingValue="{x:Bind Profile.HasElevate, Mode=OneWay}"
-                                        SettingOverrideSource="{x:Bind Profile.ElevateOverrideSource, Mode=OneWay}">
-                    <ToggleSwitch IsOn="{x:Bind Profile.Elevate, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Tab Title  -->
+            <local:SettingContainer x:Uid="Profile_TabTitle"
+                                    ClearSettingValue="{x:Bind Profile.ClearTabTitle}"
+                                    CurrentValue="{x:Bind Profile.TabTitle, Mode=OneWay}"
+                                    HasSettingValue="{x:Bind Profile.HasTabTitle, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.TabTitleOverrideSource, Mode=OneWay}"
+                                    Style="{StaticResource ExpanderSettingContainerStyle}">
+                <TextBox Style="{StaticResource TextBoxSettingStyle}"
+                         Text="{x:Bind Profile.TabTitle, Mode=TwoWay}" />
+            </local:SettingContainer>
 
-                <!--  Hidden  -->
-                <local:SettingContainer x:Uid="Profile_Hidden"
-                                        Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
-                    <ToggleSwitch IsOn="{x:Bind Profile.Hidden, Mode=TwoWay}"
-                                  Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-                </local:SettingContainer>
+            <!--  Elevate  -->
+            <local:SettingContainer x:Uid="Profile_Elevate"
+                                    ClearSettingValue="{x:Bind Profile.ClearElevate}"
+                                    HasSettingValue="{x:Bind Profile.HasElevate, Mode=OneWay}"
+                                    SettingOverrideSource="{x:Bind Profile.ElevateOverrideSource, Mode=OneWay}">
+                <ToggleSwitch IsOn="{x:Bind Profile.Elevate, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <TextBlock x:Uid="Profile_AdditionalSettingsHeader"
-                           Margin="0,48,0,0"
-                           Style="{StaticResource TextBlockSubHeaderStyle}" />
+            <!--  Hidden  -->
+            <local:SettingContainer x:Uid="Profile_Hidden"
+                                    Visibility="{x:Bind local:Converters.InvertedBooleanToVisibility(Profile.IsBaseLayer), Mode=OneWay}">
+                <ToggleSwitch IsOn="{x:Bind Profile.Hidden, Mode=TwoWay}"
+                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+            </local:SettingContainer>
 
-                <Button x:Name="AppearanceNavigator"
-                        Click="Appearance_Click"
-                        Style="{StaticResource NavigatorButtonStyle}">
-                    Appearance
-                </Button>
-                <Button x:Name="AdvancedNavigator"
-                        Click="Advanced_Click"
-                        Style="{StaticResource NavigatorButtonStyle}">
-                    <TextBlock HorizontalAlignment="Left"
-                               VerticalAlignment="Center"
-                               Text="Advanced" />
-                </Button>
-                <!--  Delete Button  -->
-                <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
-                    <Button x:Name="DeleteButton"
-                            Margin="{StaticResource StandardControlMargin}"
-                            Style="{StaticResource DeleteButtonStyle}"
-                            Visibility="{x:Bind Profile.CanDeleteProfile}">
-                        <Button.Content>
-                            <StackPanel Orientation="Horizontal">
-                                <FontIcon FontSize="{StaticResource StandardIconSize}"
-                                          Glyph="&#xE74D;" />
-                                <TextBlock x:Uid="Profile_DeleteButton"
-                                           Margin="10,0,0,0" />
+            <TextBlock x:Uid="Profile_AdditionalSettingsHeader"
+                       Margin="0,48,0,0"
+                       Style="{StaticResource TextBlockSubHeaderStyle}" />
+
+            <Button x:Name="AppearanceNavigator"
+                    Click="Appearance_Click"
+                    Style="{StaticResource NavigatorButtonStyle}">
+                Appearance
+            </Button>
+            <Button x:Name="AdvancedNavigator"
+                    Click="Advanced_Click"
+                    Style="{StaticResource NavigatorButtonStyle}">
+                <TextBlock HorizontalAlignment="Left"
+                           VerticalAlignment="Center"
+                           Text="Advanced" />
+            </Button>
+            <!--  Delete Button  -->
+            <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
+                <Button x:Name="DeleteButton"
+                        Margin="{StaticResource StandardControlMargin}"
+                        Style="{StaticResource DeleteButtonStyle}"
+                        Visibility="{x:Bind Profile.CanDeleteProfile}">
+                    <Button.Content>
+                        <StackPanel Orientation="Horizontal">
+                            <FontIcon FontSize="{StaticResource StandardIconSize}"
+                                      Glyph="&#xE74D;" />
+                            <TextBlock x:Uid="Profile_DeleteButton"
+                                       Margin="10,0,0,0" />
+                        </StackPanel>
+                    </Button.Content>
+                    <Button.Flyout>
+                        <Flyout>
+                            <StackPanel>
+                                <TextBlock x:Uid="Profile_DeleteConfirmationMessage"
+                                           Style="{StaticResource CustomFlyoutTextStyle}" />
+                                <Button x:Uid="Profile_DeleteConfirmationButton"
+                                        Click="DeleteConfirmation_Click" />
                             </StackPanel>
-                        </Button.Content>
-                        <Button.Flyout>
-                            <Flyout>
-                                <StackPanel>
-                                    <TextBlock x:Uid="Profile_DeleteConfirmationMessage"
-                                               Style="{StaticResource CustomFlyoutTextStyle}" />
-                                    <Button x:Uid="Profile_DeleteConfirmationButton"
-                                            Click="DeleteConfirmation_Click" />
-                                </StackPanel>
-                            </Flyout>
-                        </Button.Flyout>
-                    </Button>
-                </Border>
-            </StackPanel>
-        </ScrollViewer>
+                        </Flyout>
+                    </Button.Flyout>
+                </Button>
+            </Border>
+        </StackPanel>
     </Grid>
 </Page>
diff --git a/src/cascadia/TerminalSettingsEditor/Rendering.xaml b/src/cascadia/TerminalSettingsEditor/Rendering.xaml
index 96a6ee95c6a..f19f33c145e 100644
--- a/src/cascadia/TerminalSettingsEditor/Rendering.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Rendering.xaml
@@ -18,28 +18,26 @@
         </ResourceDictionary>
     </Page.Resources>
 
-    <ScrollViewer ViewChanging="ViewChanging">
-        <StackPanel Style="{StaticResource SettingsStackStyle}">
-            <TextBlock x:Uid="Globals_RenderingDisclaimer"
-                       Style="{StaticResource DisclaimerStyle}" />
+    <StackPanel Style="{StaticResource SettingsStackStyle}">
+        <TextBlock x:Uid="Globals_RenderingDisclaimer"
+                   Style="{StaticResource DisclaimerStyle}" />
 
-            <!--  AtlasEngine  -->
-            <local:SettingContainer x:Uid="Profile_UseAtlasEngine">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.UseAtlasEngine, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  AtlasEngine  -->
+        <local:SettingContainer x:Uid="Profile_UseAtlasEngine">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.UseAtlasEngine, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Force Full Repaint  -->
-            <local:SettingContainer x:Uid="Globals_ForceFullRepaint">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.ForceFullRepaintRendering, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
+        <!--  Force Full Repaint  -->
+        <local:SettingContainer x:Uid="Globals_ForceFullRepaint">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.ForceFullRepaintRendering, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
 
-            <!--  Software Rendering  -->
-            <local:SettingContainer x:Uid="Globals_SoftwareRendering">
-                <ToggleSwitch IsOn="{x:Bind ViewModel.SoftwareRendering, Mode=TwoWay}"
-                              Style="{StaticResource ToggleSwitchInExpanderStyle}" />
-            </local:SettingContainer>
-        </StackPanel>
-    </ScrollViewer>
+        <!--  Software Rendering  -->
+        <local:SettingContainer x:Uid="Globals_SoftwareRendering">
+            <ToggleSwitch IsOn="{x:Bind ViewModel.SoftwareRendering, Mode=TwoWay}"
+                          Style="{StaticResource ToggleSwitchInExpanderStyle}" />
+        </local:SettingContainer>
+    </StackPanel>
 </Page>


Test patch: