diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index 72c8f039ed0b..c45d8d9f8f73 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -734,6 +734,7 @@ workflow_editor:
       duplicate_selection: "[title='duplicate selected']"
       delete_selection: "[title='delete selected']"
       auto_layout: "#auto-layout-button"
+      option_save_as: ".activity-settings-item[contains(text(), 'Save as')]"
   comment:
     selectors:
       _: ".workflow-editor-comment"
diff --git a/lib/galaxy_test/selenium/test_workflow_editor.py b/lib/galaxy_test/selenium/test_workflow_editor.py
index 9bad6194f845..2b72f7354001 100644
--- a/lib/galaxy_test/selenium/test_workflow_editor.py
+++ b/lib/galaxy_test/selenium/test_workflow_editor.py
@@ -473,7 +473,11 @@ def test_save_as(self):
         self.workflow_index_open_with_name(name)
         self.sleep_for(self.wait_types.UX_RENDER)
         self.screenshot("workflow_editor_edit_menu")
-        self.workflow_editor_click_option("Save As")
+
+        if self.element_absent(self.components.workflow_editor.tool_bar.option_save_as):
+            self.components.preferences.activity.wait_for_and_click()
+
+        self.components.workflow_editor.tool_bar.option_save_as.wait_for_and_click()
 
     @selenium_test
     def test_editor_tool_upgrade(self):