diff --git a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
index ebeacba5c8..2180322638 100644
--- a/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Compatibility.xaml
@@ -43,7 +43,8 @@
         </local:SettingContainer>
 
         <!--  Ambiguous Width  -->
-        <local:SettingContainer x:Uid="Globals_AmbiguousWidth">
+        <local:SettingContainer x:Name="AmbiguousWidth"
+                                x:Uid="Globals_AmbiguousWidth">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                       ItemsSource="{x:Bind ViewModel.AmbiguousWidthList}"
diff --git a/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml b/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml
index a890b200ce..e182408434 100644
--- a/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml
+++ b/src/cascadia/TerminalSettingsEditor/NewTabMenu.xaml
@@ -329,7 +329,8 @@
             </local:SettingContainer>
 
             <!--  Icon  -->
-            <local:SettingContainer x:Uid="NewTabMenu_CurrentFolderIcon"
+            <local:SettingContainer x:Name="CurrentFolderIcon"
+                                    x:Uid="NewTabMenu_CurrentFolderIcon"
                                     CurrentValueAccessibleName="{x:Bind ViewModel.CurrentFolderLocalizedIcon, Mode=OneWay}"
                                     Style="{StaticResource ExpanderSettingContainerStyleWithComplexPreview}">
                 <local:SettingContainer.CurrentValue>
@@ -497,7 +498,8 @@
             </local:SettingContainer>
 
             <!--  Add Remaining Profiles  -->
-            <local:SettingContainer x:Uid="NewTabMenu_AddRemainingProfiles"
+            <local:SettingContainer x:Name="AddRemainingProfiles"
+                                    x:Uid="NewTabMenu_AddRemainingProfiles"
                                     FontIconGlyph="&#xE902;"
                                     Style="{StaticResource SettingContainerWithIcon}">
                 <Button x:Name="AddRemainingProfilesButton"
diff --git a/tools/GenerateSettingsIndex.ps1 b/tools/GenerateSettingsIndex.ps1
index 3152c5eef4..1a5d774702 100644
--- a/tools/GenerateSettingsIndex.ps1
+++ b/tools/GenerateSettingsIndex.ps1
@@ -207,8 +207,13 @@ foreach ($xamlFile in Get-ChildItem -Path $SourceDir -Filter *.xaml)
             continue
         }
 
-        # Extract Name (prefer x:Name over Name)
-        $name = $null -ne $settingContainer.Name ? $settingContainer.Name : ""
+        # Extract Name via GetAttribute to avoid PowerShell's XML integration
+        # returning the element name (e.g. "local:SettingContainer") when x:Name is absent.
+        $name = $settingContainer.GetAttribute("x:Name")
+        if ([string]::IsNullOrEmpty($name))
+        {
+            $name = ""
+        }
         if ($filename -eq "Appearances.xaml")
         {
             # Profile.Appearance settings need a special prefix for the ElementName.