diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
index 641ee727089e..0e26afcaace6 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
@@ -325,6 +325,7 @@
                                 Padding="0"
                                 HorizontalAlignment="Stretch"
                                 HorizontalContentAlignment="Stretch"
+                                AutomationProperties.Name="{x:Bind Label}"
                                 Background="Transparent"
                                 BorderThickness="0"
                                 Click="DashboardListItemClick"
@@ -370,9 +371,11 @@
                                             </ToolTipService.ToolTip>
                                         </FontIcon>
                                         <ToggleSwitch
+                                            x:Uid="Enable_Module"
                                             Grid.Column="3"
                                             Margin="0,-2,0,0"
                                             HorizontalAlignment="Right"
+                                            AutomationProperties.HelpText="{x:Bind Label}"
                                             IsEnabled="{x:Bind IsLocked, Converter={StaticResource BoolNegationConverter}, ConverterParameter=True, Mode=OneWay}"
                                             IsOn="{x:Bind IsEnabled, Mode=TwoWay}"
                                             OffContent=""
@@ -383,6 +386,7 @@
                                     <ItemsControl
                                         Grid.Row="1"
                                         Margin="16,8,16,16"
+                                        IsTabStop="False"
                                         ItemTemplateSelector="{StaticResource ModuleItemTemplateSelector}"
                                         ItemsSource="{x:Bind DashboardModuleItems, Mode=OneWay}"
                                         Visibility="{x:Bind IsEnabled, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
@@ -416,6 +420,7 @@
                                 Padding="0"
                                 HorizontalAlignment="Stretch"
                                 HorizontalContentAlignment="Stretch"
+                                AutomationProperties.Name="{x:Bind Label}"
                                 Background="Transparent"
                                 BorderThickness="0"
                                 Click="DashboardListItemClick"
@@ -458,9 +463,11 @@
                                             </ToolTipService.ToolTip>
                                         </FontIcon>
                                         <ToggleSwitch
+                                            x:Uid="Enable_Module"
                                             Grid.Column="3"
                                             Margin="0,-2,0,0"
                                             HorizontalAlignment="Right"
+                                            AutomationProperties.HelpText="{x:Bind Label}"
                                             IsEnabled="{x:Bind IsLocked, Converter={StaticResource BoolNegationConverter}, ConverterParameter=True, Mode=OneWay}"
                                             IsOn="{x:Bind IsEnabled, Mode=TwoWay}"
                                             OffContent=""
diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index c2a3b11269ef..ae52de4ce693 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -4686,4 +4686,7 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="Shell_TopLevelSystemTools.Content" xml:space="preserve">
     <value>System Tools</value>
   </data>
+  <data name="Enable_Module.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Enable module</value>
+  </data>
 </root>
\ No newline at end of file