diff --git a/client/src/components/GalaxyAI/ChatHistoryPanel.vue b/client/src/components/GalaxyAI/ChatHistoryPanel.vue
index e15aab42dd3..b1edf7964ef 100644
--- a/client/src/components/GalaxyAI/ChatHistoryPanel.vue
+++ b/client/src/components/GalaxyAI/ChatHistoryPanel.vue
@@ -107,6 +107,7 @@ async function deleteSelected() {
             </GButton>
             <GButton
                 :color="selectionMode ? 'grey' : 'red'"
+                :disabled="chatHistory.length === 0"
                 outline
                 :title="selectionMode ? 'Cancel selection' : 'Select chats to delete'"
                 @click="toggleSelectionMode">
@@ -124,9 +125,14 @@ async function deleteSelected() {
                 <FontAwesomeIcon :icon="allSelected ? faCheckSquare : faSquare" fixed-width />
                 {{ allSelected ? "Deselect all" : "Select all" }}
             </span>
-            <button class="btn btn-sm btn-danger" :disabled="selectedIds.size === 0" @click="deleteSelected">
+            <GButton
+                color="red"
+                data-description="delete selected chats"
+                :disabled="selectedIds.size === 0"
+                size="small"
+                @click="deleteSelected">
                 Delete {{ selectedIds.size > 0 ? selectedIds.size : "" }}
-            </button>
+            </GButton>
         </div>
 
         <ScrollList
diff --git a/client/src/components/ScrollList/ScrollList.vue b/client/src/components/ScrollList/ScrollList.vue
index aecf0601e79..dd0b0de1706 100644
--- a/client/src/components/ScrollList/ScrollList.vue
+++ b/client/src/components/ScrollList/ScrollList.vue
@@ -236,7 +236,9 @@ watch(
 
                         <template v-if="!busy">
                             <slot v-if="allLoaded && items.length === 0" name="none-loaded-footer">
-                                <div class="list-end">- No {{ props.namePlural }} found -</div>
+                                <div class="list-end" data-description="no items found footer">
+                                    - No {{ props.namePlural }} found -
+                                </div>
                             </slot>
 
                             <slot v-else-if="allLoaded" name="all-loaded-footer">
diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index 986ae576618..46273128abf 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -1662,11 +1662,11 @@ galaxyai:
       _: '.activity-panel[data-description="GalaxyAI"]'
       toggle_selection_mode: 'button[title="Select chats to delete"]'
       cancel_selection: 'button[title="Cancel selection"]'
-      history_item: '[data-description="sidebar item"]'
-      history_checkbox: '[data-description="sidebar item"] .history-checkbox'
-      delete_selected_button: '.selection-toolbar .btn-danger'
+      history_item: '.chat-history-item'
+      history_checkbox: '.chat-history-item .history-checkbox'
+      delete_selected_button: '.selection-toolbar [data-description="delete selected chats"]'
       select_all_toggle: '.select-all-toggle'
-      empty_message: '[data-description="sidebar list empty"]'
+      empty_message: '[data-description="no items found footer"]'
 
 galaxy_wizard:
   selectors:
diff --git a/lib/galaxy_test/selenium/test_galaxyai.py b/lib/galaxy_test/selenium/test_galaxyai.py
index 4d90ae247c7..ed5507b66cb 100644
--- a/lib/galaxy_test/selenium/test_galaxyai.py
+++ b/lib/galaxy_test/selenium/test_galaxyai.py
@@ -116,5 +116,8 @@ class TestGalaxyAI(SeleniumTestCase):
         # Delete selected
         history.delete_selected_button.wait_for_and_click()
 
+        # Confirm deletion
+        self.components.confirm_dialog.ok_button.wait_for_and_click()
+
         # Verify all items were removed (panel should be empty)
         history.empty_message.wait_for_visible()