diff --git a/client/src/components/Workflow/Editor/Connector.vue b/client/src/components/Workflow/Editor/Connector.vue
index 24f0fdb7e58..dfb52eda111 100644
--- a/client/src/components/Workflow/Editor/Connector.vue
+++ b/client/src/components/Workflow/Editor/Connector.vue
@@ -1,5 +1,5 @@
 <template>
-    <g class="ribbon">
+    <g class="ribbon" :id="id">
         <g v-for="line in paths">
             <path class="ribbon-outer" :d="line" :stroke-width="stroke.outerStroke" fill="none"></path>
             <path class="ribbon-inner" :d="line" :stroke-width="stroke.innerStroke" fill="none"></path>
diff --git a/client/src/components/Workflow/Editor/TerminalConnector.vue b/client/src/components/Workflow/Editor/TerminalConnector.vue
index 73f13ac2a39..e7039869bc8 100644
--- a/client/src/components/Workflow/Editor/TerminalConnector.vue
+++ b/client/src/components/Workflow/Editor/TerminalConnector.vue
@@ -1,6 +1,7 @@
 <template>
     <raw-connector
         v-if="position"
+        :id="connectionId"
         :position="position"
         :output-is-mapped-over="outputIsMappedOver"
         :input-is-mapped-over="inputIsMappedOver"></raw-connector>
@@ -22,6 +23,9 @@ const outputIsMappedOver = computed(() => stepStore.stepMapOver[props.connection
 const inputIsMappedOver = computed(() => stepStore.stepMapOver[props.connection.input.stepId]?.isCollection);
 
 const stateStore = useWorkflowStateStore();
+const connectionId = computed(() => {
+    return `connection-node-${props.connection.input.stepId}-input-${props.connection.input.name}-node-${props.connection.output.stepId}-output-${props.connection.output.name}`;
+});
 const position = computed(() => {
     const outputPos = stateStore.getOutputTerminalPosition(
         props.connection.output.stepId,
diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index 869da96d6ae..d9b708e46be 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -638,7 +638,7 @@ workflow_editor:
       selector: >
         //div[@data-label='Remove Tags' and not(ancestor::div[contains(@style,'display: none')])]//input
     tool_version_button: ".tool-versions"
-    connector_for: "div[output-handle-id='${source_id}'][input-handle-id='${sink_id}']"
+    connector_for: "#connection-${sink_id}-${source_id}"
     connector_destroy_callout: '.delete-terminal'
     save_button: '.editor-button-save'
     state_modal_body: '.state-upgrade-modal'
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index 82d7fb69e70..65bee046030 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -658,6 +658,10 @@ class NavigatesGalaxy(HasDriver):
         center_element = self.driver.find_element(By.CSS_SELECTOR, "#center")
         action_chains.move_to_element(center_element).click().perform()
 
+    def hover_over(self, target):
+        action_chains = self.action_chains()
+        action_chains.move_to_element(target).perform()
+
     def perform_upload(self, test_path, **kwd):
         self._perform_upload(test_path=test_path, **kwd)
 
diff --git a/lib/galaxy_test/selenium/test_workflow_editor.py b/lib/galaxy_test/selenium/test_workflow_editor.py
index 88ef6c9c9ea..b2cdbcba719 100644
--- a/lib/galaxy_test/selenium/test_workflow_editor.py
+++ b/lib/galaxy_test/selenium/test_workflow_editor.py
@@ -844,8 +844,8 @@ steps:
 
         sink_node_label, sink_input_name = sink.split("#", 1)
         sink_node = editor.node._(label=sink_node_label)
-        sink_input = sink_node.input_terminal(name=sink_input_name)
-        sink_input.wait_for_and_click()
+        sink_input = sink_node.input_terminal(name=sink_input_name).wait_for_visible()
+        self.hover_over(sink_input)
         editor.connector_destroy_callout.wait_for_and_click()
 
     def assert_input_mapped(self, sink):