diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index 52cbbe2886bc..cbda322fa479 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -809,7 +809,7 @@ invocations:
     step_output_collection_toggle: '[data-step="${order_index}"] .invocation-step-output-collection-details .name'
     step_output_collection_element_identifier:
       type: xpath
-      selector: '//span[@class="content-title name"][text()="${element_identifier}"]'
+      selector: '//span[contains(@class, "content-title name")][text()="${element_identifier}"]'
     step_output_collection_element_datatype: '[data-step="${order_index}"] .invocation-step-output-collection-details .not-loading .datatype .value'
     step_job_details: '[data-step="${order_index}"] .invocation-step-job-details'
     step_job_table: '[data-step="${order_index}"] .invocation-step-job-details table'
diff --git a/lib/galaxy_test/selenium/test_history_multi_view.py b/lib/galaxy_test/selenium/test_history_multi_view.py
index c73ee0a56abb..02a3c88a5a7c 100644
--- a/lib/galaxy_test/selenium/test_history_multi_view.py
+++ b/lib/galaxy_test/selenium/test_history_multi_view.py
@@ -28,9 +28,9 @@ def test_list_list_display(self):
         method = self.dataset_collection_populator.create_list_of_list_in_history(history_id, wait=True).json
         self.prepare_multi_history_view(method)
         dataset_selector = self.history_panel_wait_for_hid_state(1, None, multi_history_panel=True)
-        self.click(dataset_selector)
+        dataset_selector.wait_for_and_click()
         dataset_selector = self.history_panel_wait_for_hid_state(3, None, multi_history_panel=True)
-        self.click(dataset_selector)
+        dataset_selector.wait_for_and_click()
         self.screenshot("multi_history_list_list")
 
     def prepare_multi_history_view(self, collection_populator_method):
@@ -42,5 +42,5 @@ def prepare_multi_history_view(self, collection_populator_method):
         self.home()
         self.open_history_multi_view()
         selector = self.history_panel_wait_for_hid_state(collection_hid, "ok", multi_history_panel=True)
-        self.click(selector)
+        selector.wait_for_and_click()
         return selector