diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml
index aa14b0878a..aba9ed477d 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml
@@ -165,6 +165,7 @@
                 x:Name="PrimaryButton"
                 Padding="6,4,4,4"
                 x:Load="{x:Bind IsLoaded, Mode=OneWay}"
+                AutomationProperties.AutomationId="PrimaryCommandButton"
                 AutomationProperties.Name="{x:Bind ViewModel.PrimaryCommand.Name, Mode=OneWay}"
                 Background="Transparent"
                 Click="PrimaryButton_Clicked"
@@ -184,6 +185,7 @@
                 x:Name="SecondaryButton"
                 Padding="6,4,4,4"
                 x:Load="{x:Bind IsLoaded, Mode=OneWay}"
+                AutomationProperties.AutomationId="SecondaryCommandButton"
                 AutomationProperties.Name="{x:Bind ViewModel.SecondaryCommand.Name, Mode=OneWay}"
                 Click="SecondaryButton_Clicked"
                 Style="{StaticResource SubtleButtonStyle}"
@@ -207,6 +209,7 @@
                 x:Name="MoreCommandsButton"
                 x:Uid="MoreCommandsButton"
                 Padding="6,4,4,4"
+                AutomationProperties.AutomationId="MoreContextMenuButton"
                 Click="MoreCommandsButton_Clicked"
                 Style="{StaticResource SubtleButtonStyle}"
                 ToolTipService.ToolTip="Ctrl+K"
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml
index 379ea6b03d..80eb1a3ad6 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml
@@ -22,6 +22,7 @@
         MinHeight="32"
         VerticalAlignment="Stretch"
         VerticalContentAlignment="Stretch"
+        AutomationProperties.AutomationId="MainSearchBox"
         KeyDown="FilterBox_KeyDown"
         PlaceholderText="{x:Bind CurrentPageViewModel.PlaceholderText, Converter={StaticResource PlaceholderTextConverter}, Mode=OneWay}"
         PreviewKeyDown="FilterBox_PreviewKeyDown"
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/CommandPaletteTestBase.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/CommandPaletteTestBase.cs
index ab7dac1a3a..a839c3e999 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/CommandPaletteTestBase.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/CommandPaletteTestBase.cs
@@ -19,29 +19,22 @@ public class CommandPaletteTestBase : UITestBase
     {
     }
 
-    protected void SetSearchBox(string text)
-    {
-        Assert.AreEqual(this.Find<TextBox>("Type here to search...").SetText(text, true).Text, text);
-    }
+    protected void SetSearchBox(string text) => SetSearchBoxText(text);
 
-    protected void SetFilesExtensionSearchBox(string text)
-    {
-        Assert.AreEqual(this.Find<TextBox>("Search for files and folders...").SetText(text, true).Text, text);
-    }
+    protected void SetFilesExtensionSearchBox(string text) => SetSearchBoxText(text);
 
-    protected void SetCalculatorExtensionSearchBox(string text)
-    {
-        Assert.AreEqual(this.Find<TextBox>("Type an equation...").SetText(text, true).Text, text);
-    }
+    protected void SetCalculatorExtensionSearchBox(string text) => SetSearchBoxText(text);
 
-    protected void SetTimeAndDaterExtensionSearchBox(string text)
+    protected void SetTimeAndDaterExtensionSearchBox(string text) => SetSearchBoxText(text);
+
+    private void SetSearchBoxText(string text)
     {
-        Assert.AreEqual(this.Find<TextBox>("Search values or type a custom time stamp...").SetText(text, true).Text, text);
+        Assert.AreEqual(this.Find<TextBox>(By.AccessibilityId("MainSearchBox")).SetText(text, true).Text, text);
     }
 
     protected void OpenContextMenu()
     {
-        var contextMenuButton = this.Find<Button>("More");
+        var contextMenuButton = this.Find<Button>(By.AccessibilityId("MoreContextMenuButton"));
         Assert.IsNotNull(contextMenuButton, "Context menu button not found.");
         contextMenuButton.Click();
     }
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/IndexerTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/IndexerTests.cs
index 5db97e7a25..c60ca6bf5f 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/IndexerTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/IndexerTests.cs
@@ -69,7 +69,7 @@ public class IndexerTests : CommandPaletteTestBase
 
         searchItem.Click();
 
-        var openButton = this.Find<Button>("Open with");
+        var openButton = this.Find<Button>(By.AccessibilityId("PrimaryCommandButton"));
         Assert.IsNotNull(openButton);
 
         openButton.Click();
@@ -144,7 +144,7 @@ public class IndexerTests : CommandPaletteTestBase
         Assert.IsNotNull(searchItem);
         searchItem.Click();
 
-        var openButton = this.Find<Button>("Browse");
+        var openButton = this.Find<Button>(By.AccessibilityId("SecondaryCommandButton"));
         Assert.IsNotNull(openButton);
 
         openButton.Click();