diff --git a/client/src/components/Workflow/services.js b/client/src/components/Workflow/services.js
index d354fda81826..ab0f1f4acaf2 100644
--- a/client/src/components/Workflow/services.js
+++ b/client/src/components/Workflow/services.js
@@ -32,7 +32,7 @@ export class Services {
     async createWorkflow(workflow) {
         const url = withPrefix("/api/workflows");
         try {
-            const { data } = await axios.post(url, { workflow: toSimple(workflow.id, workflow) });
+            const { data } = await axios.post(url, { workflow: toSimple(workflow.id, workflow), from_tool_form: true });
             return data;
         } catch (e) {
             rethrowSimple(e);
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index f156f348703d..ac13d0fbe605 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -1510,7 +1510,7 @@ def workflow_run_ensure_expanded(self):
             workflow_run.expand_form_link.wait_for_and_click()
             workflow_run.expanded_form.wait_for_visible()
 
-    def workflow_create_new(self, annotation=None, clear_placeholder=False):
+    def workflow_create_new(self, annotation=None, clear_placeholder=False, save_workflow=True):
         self.workflow_index_open()
         self.sleep_for(self.wait_types.UX_RENDER)
         self.click_button_new_workflow()
@@ -1522,11 +1522,12 @@ def workflow_create_new(self, annotation=None, clear_placeholder=False):
         name_component.wait_for_and_send_keys(name)
         annotation = annotation or self._get_random_name()
         self.components.workflow_editor.edit_annotation.wait_for_and_send_keys(annotation)
-        save_button = self.components.workflow_editor.save_button
-        save_button.wait_for_visible()
-        assert not save_button.has_class("disabled")
-        save_button.wait_for_and_click()
-        self.sleep_for(self.wait_types.UX_RENDER)
+        if save_workflow:
+            save_button = self.components.workflow_editor.save_button
+            save_button.wait_for_visible()
+            assert not save_button.has_class("disabled")
+            save_button.wait_for_and_click()
+            self.sleep_for(self.wait_types.UX_RENDER)
         return name
 
     def invocation_index_table_elements(self):
diff --git a/lib/galaxy_test/selenium/test_workflow_editor.py b/lib/galaxy_test/selenium/test_workflow_editor.py
index a98e5f3b756b..39471e887267 100644
--- a/lib/galaxy_test/selenium/test_workflow_editor.py
+++ b/lib/galaxy_test/selenium/test_workflow_editor.py
@@ -224,7 +224,7 @@ def test_data_column_input_editing(self):
     def test_integer_input(self):
         editor = self.components.workflow_editor
 
-        name = self.workflow_create_new()
+        name = self.workflow_create_new(save_workflow=False)
         self.workflow_editor_add_input(item_name="parameter_input")
         self.screenshot("workflow_editor_parameter_input_new")
         editor.label_input.wait_for_and_send_keys("input1")