diff --git a/client/src/components/Upload/UploadContainer.vue b/client/src/components/Upload/UploadContainer.vue
index fac6c8ba3171..7b918c349545 100644
--- a/client/src/components/Upload/UploadContainer.vue
+++ b/client/src/components/Upload/UploadContainer.vue
@@ -177,12 +177,7 @@ defineExpose({
         </span>
     </BAlert>
     <BTabs v-else-if="ready">
-        <BTab
-            v-if="showRegular"
-            id="regular"
-            title="Regular"
-            button-id="tab-title-link-regular"
-            :active.sync="regularTabActive">
+        <BTab v-if="showRegular" title="Regular" button-id="tab-title-link-regular" :active.sync="regularTabActive">
         </BTab>
         <BTab v-if="showComposite" id="composite" title="Composite" button-id="tab-title-link-composite">
             <CompositeBox
@@ -197,7 +192,6 @@ defineExpose({
         </BTab>
         <BTab
             v-if="showCollection"
-            id="collection"
             title="Collection"
             button-id="tab-title-link-collection"
             :active.sync="collectionTabActive">
@@ -213,6 +207,7 @@ defineExpose({
         <DefaultBox
             v-if="showRegular || showCollection"
             v-show="regularTabActive || collectionTabActive"
+            :id="collectionTabActive ? 'collection' : 'regular'"
             ref="regular"
             :chunk-upload-size="chunkUploadSize"
             :default-db-key="defaultDbKey"
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index cfb53b38bf7c..5924cfd0ca95 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -894,7 +894,7 @@ def _perform_upload(
 
         self.upload_start()
 
-        self.wait_for_and_click_selector("button#btn-close")
+        self.components.upload.close_button.wait_for_and_click()
 
     def perform_upload_of_composite_dataset_pasted_data(self, ext, paste_content):
         self.home()