diff --git a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp
index 827212de38..a340d80347 100644
--- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp
+++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp
@@ -309,6 +309,16 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         KeyChordViewModelList().Append(*kbdVM);
     }
 
+    winrt::hstring CommandViewModel::ActionNameTextBoxAutomationPropName()
+    {
+        return RS_(L"Actions_Name/Text");
+    }
+
+    winrt::hstring CommandViewModel::ShortcutActionComboBoxAutomationPropName()
+    {
+        return RS_(L"Actions_ShortcutAction/Text");
+    }
+
     void CommandViewModel::_RegisterKeyChordVMEvents(Editor::KeyChordViewModel kcVM)
     {
         const auto id = ID();
diff --git a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h
index 9f6f36e3fd..1487009c56 100644
--- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h
+++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.h
@@ -108,6 +108,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         void AddKeybinding_Click();
 
+        // UIA text
+        winrt::hstring ActionNameTextBoxAutomationPropName();
+        winrt::hstring ShortcutActionComboBoxAutomationPropName();
+
         til::typed_event<IInspectable, Editor::ArgWrapper> PropagateColorSchemeRequested;
         til::typed_event<IInspectable, Editor::ArgWrapper> PropagateColorSchemeNamesRequested;
         til::typed_event<IInspectable, Editor::ArgWrapper> PropagateWindowRootRequested;
diff --git a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl
index 212f62c58a..412268ee81 100644
--- a/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl
+++ b/src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl
@@ -45,6 +45,10 @@ namespace Microsoft.Terminal.Settings.Editor
         event Windows.Foundation.TypedEventHandler<Object, ArgWrapper> PropagateColorSchemeNamesRequested;
         event Windows.Foundation.TypedEventHandler<Object, ArgWrapper> PropagateWindowRootRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> FocusContainer;
+
+        // UI side (edit command page, automation property names)
+        String ActionNameTextBoxAutomationPropName { get; };
+        String ShortcutActionComboBoxAutomationPropName { get; };
     }
 
     runtimeclass ArgWrapper : Windows.UI.Xaml.Data.INotifyPropertyChanged
diff --git a/src/cascadia/TerminalSettingsEditor/EditAction.xaml b/src/cascadia/TerminalSettingsEditor/EditAction.xaml
index 86419b40e2..938f3303dc 100644
--- a/src/cascadia/TerminalSettingsEditor/EditAction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/EditAction.xaml
@@ -645,6 +645,7 @@
                      Grid.Column="1"
                      Width="300"
                      HorizontalAlignment="Left"
+                     AutomationProperties.Name="{x:Bind ViewModel.ActionNameTextBoxAutomationPropName}"
                      PlaceholderText="{x:Bind ViewModel.DisplayName, Mode=OneWay}"
                      Text="{x:Bind ViewModel.Name, Mode=TwoWay}" />
             <TextBlock x:Uid="Actions_ShortcutAction"
@@ -654,6 +655,7 @@
             <ComboBox Grid.Row="1"
                       Grid.Column="1"
                       VerticalAlignment="Center"
+                      AutomationProperties.Name="{x:Bind ViewModel.ShortcutActionComboBoxAutomationPropName}"
                       ItemsSource="{x:Bind ViewModel.AvailableShortcutActions, Mode=OneWay}"
                       SelectedItem="{x:Bind ViewModel.ProposedShortcutAction, Mode=TwoWay}" />
             <TextBlock x:Uid="Actions_Arguments"