diff --git a/client/src/components/Collections/common/CollectionCreator.vue b/client/src/components/Collections/common/CollectionCreator.vue
index 1dc1ddf36efa..11cb51c9a8bb 100644
--- a/client/src/components/Collections/common/CollectionCreator.vue
+++ b/client/src/components/Collections/common/CollectionCreator.vue
@@ -194,7 +194,11 @@ watch(
                                 {{ localize("Remove file extensions?") }}
                             </BFormCheckbox>
 
-                            <BFormCheckbox v-model="localHideSourceItems" name="hide-originals" switch>
+                            <BFormCheckbox
+                                v-model="localHideSourceItems"
+                                name="hide-originals"
+                                data-description="hide original elements"
+                                switch>
                                 <HelpText
                                     uri="galaxy.collections.collectionBuilder.hideOriginalElements"
                                     :text="localize('Hide original elements')" />
@@ -208,6 +212,7 @@ watch(
                             <BFormInput
                                 id="collection-name"
                                 v-model="collectionName"
+                                class="collection-name"
                                 :placeholder="localize('Enter a name for your new collection')"
                                 size="sm"
                                 required
diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index dc4fcaeaa0cb..05f9a5a964d6 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -438,7 +438,7 @@ history_copy_elements:
 
 collection_builders:
   selectors:
-    clear_filters: "a.clear-filters-link"
+    clear_filters: "button.clear-filters-link"
     forward_datasets: ".forward-column .column-datasets"
     reverse_datasets: ".reverse-column .column-datasets"
     name: "input.collection-name"
@@ -1051,7 +1051,7 @@ libraries:
       export_to_history_paired_option: 'option[value="${collection_option}"]'
       export_to_history_collection_name: '.collection-name'
       export_to_history_new_history: 'input[name=history_name]'
-      clear_filters: '.clear-filters-link'
+      clear_filters: "button.clear-filters-link"
       import_progress_bar: '.progress-bar-import'
       import_from_path_textarea: '#import_paths'
       select_all: '#select-all-checkboxes'
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index 7a1c2aab576c..ef499834b962 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -1987,13 +1987,13 @@ def _wait_for_input_text_component_and_fill(self, component, text):
         target_element.send_keys(text)
 
     def collection_builder_hide_originals(self):
-        self.wait_for_and_click_selector("input.hide-originals")
+        self.wait_for_and_click_selector('[data-description="hide original elements"]')
 
     def collection_builder_create(self):
         self.wait_for_and_click_selector("button.create-collection")
 
     def collection_builder_clear_filters(self):
-        self.wait_for_and_click_selector("a.clear-filters-link")
+        self.wait_for_and_click_selector("button.clear-filters-link")
 
     def collection_builder_click_paired_item(self, forward_or_reverse, item):
         assert forward_or_reverse in ["forward", "reverse"]