diff --git a/client/src/components/Workflow/Editor/Index.vue b/client/src/components/Workflow/Editor/Index.vue
index 73494320a0f..122285db6b0 100644
--- a/client/src/components/Workflow/Editor/Index.vue
+++ b/client/src/components/Workflow/Editor/Index.vue
@@ -688,11 +688,15 @@ export default {
             const runUrl = `/workflows/run?id=${this.id}`;
             this.onNavigate(runUrl);
         },
-        onNavigate(url) {
-            this.onSave(true).then(() => {
-                this.hasChanges = false;
-                this.$router.push(url);
-            });
+        async onNavigate(url) {
+            if (this.isNewTempWorkflow) {
+                await this.onCreate();
+            } else {
+                await this.onSave(true);
+            }
+
+            this.hasChanges = false;
+            this.$router.push(url);
         },
         onSave(hideProgress = false) {
             if (!this.nameValidate()) {
diff --git a/client/src/entry/analysis/modules/WorkflowEditor.vue b/client/src/entry/analysis/modules/WorkflowEditor.vue
index 3ef6913db65..9ed4b55b3b9 100644
--- a/client/src/entry/analysis/modules/WorkflowEditor.vue
+++ b/client/src/entry/analysis/modules/WorkflowEditor.vue
@@ -1,6 +1,7 @@
 <template>
     <Editor
         v-if="editorConfig"
+        :key="editorReloadKey"
         :workflow-id="editorConfig.id"
         :data-managers="editorConfig.dataManagers"
         :initial-version="editorConfig.initialVersion"
@@ -23,6 +24,7 @@ export default {
             storedWorkflowId: null,
             workflowId: null,
             editorConfig: null,
+            editorReloadKey: 0,
         };
     },
     watch: {
@@ -35,15 +37,29 @@ export default {
     },
     methods: {
         async getEditorConfig() {
-            const storedWorkflowId = Query.get("id");
-            const workflowId = Query.get("workflow_id");
-            const params = {};
-            if (workflowId) {
-                params.workflow_id = workflowId;
-            } else if (storedWorkflowId) {
-                params.id = storedWorkflowId;
+            let reloadEditor = true;
+
+            // this will only be the case the first time the route updates from a new workflow
+            if (!this.storedWorkflowId && !this.workflowId) {
+                reloadEditor = false;
             }
+
+            this.storedWorkflowId = Query.get("id");
+            this.workflowId = Query.get("workflow_id");
+
+            const params = {};
+
+            if (this.workflowId) {
+                params.workflow_id = this.workflowId;
+            } else if (this.storedWorkflowId) {
+                params.id = this.storedWorkflowId;
+            }
+
             this.editorConfig = await urlData({ url: "/workflow/editor", params });
+
+            if (reloadEditor) {
+                this.editorReloadKey += 1;
+            }
         },
     },
 };