diff --git a/client/src/components/Workflow/Editor/Index.vue b/client/src/components/Workflow/Editor/Index.vue
index 8817e61e56a..fb9f48e6479 100644
--- a/client/src/components/Workflow/Editor/Index.vue
+++ b/client/src/components/Workflow/Editor/Index.vue
@@ -69,7 +69,6 @@
                     :steps="steps"
                     :datatypes-mapper="datatypesMapper"
                     :get-manager="getManager"
-                    @onActiveNode="onActiveNode"
                     @onAdd="onAdd"
                     @onUpdate="onUpdate"
                     @onClone="onClone"
@@ -250,10 +249,10 @@ export default {
             steps: {},
             hasChanges: false,
             nodes: {},
+            nodeIndex: 0,
             datatypesMapper: null,
             datatypes: [],
             report: {},
-            activeNode: null,
             labels: {},
             license: null,
             creator: null,
@@ -282,8 +281,12 @@ export default {
         postJobActions() {
             return this.activeNode.postJobActions;
         },
+        activeNode() {
+            // TODO: replace usage of this with just data ?
+            return this.nodes[this.activeNodeId];
+        },
         activeNodeId() {
-            return this.activeNode && this.activeNode.id;
+            return this.$store.getters.getActiveNode();
         },
         activeNodeName() {
             return this.activeNode?.name;
@@ -337,6 +340,7 @@ export default {
         },
         steps(newSteps, oldSteps) {
             this.hasChanges = true;
+            this.nodeIndex = Math.max(...Object.keys(newSteps).map((k) => parseInt(k))) + 1;
         },
         nodes(newNodes, oldNodes) {
             this.hasChanges = true;
@@ -442,7 +446,7 @@ export default {
             this.onNavigate(editUrl);
         },
         async onClone(node) {
-            const newId = Object.keys(this.steps).length;
+            const newId = this.nodeIndex++;
             const stepCopy = JSON.parse(JSON.stringify(node.step));
             await Vue.set(this.steps, newId, {
                 ...stepCopy,
@@ -454,9 +458,7 @@ export default {
                 tool_state: JSON.parse(JSON.stringify(node.tool_state)),
                 post_job_actions: JSON.parse(JSON.stringify(node.postJobActions)),
             });
-            this.canvasManager.drawOverview();
-            node = this.nodes[newId];
-            this.onActivate(node);
+            this.$store.commit("setActiveNode", newId);
         },
         onInsertTool(tool_id, tool_name) {
             this._insertStep(tool_id, tool_name, "tool");
@@ -627,11 +629,13 @@ export default {
                 this.isCanvas = true;
                 return;
             }
-            Vue.set(this.steps, Object.keys(this.steps).length, {
+            console.log(this.nodeIndex);
+            Vue.set(this.steps, this.nodeIndex++, {
                 name: name,
                 content_id: contentId,
                 type: type,
             });
+            this.$store.commit("setActiveNode", this.nodeIndex);
         },
         async _loadEditorData(data) {
             const report = data.report || {};
diff --git a/client/src/components/Workflow/Editor/WorkflowGraph.vue b/client/src/components/Workflow/Editor/WorkflowGraph.vue
index d54b5e15a84..0f68ee32f7c 100644
--- a/client/src/components/Workflow/Editor/WorkflowGraph.vue
+++ b/client/src/components/Workflow/Editor/WorkflowGraph.vue
@@ -64,7 +64,6 @@ export default {
             isWheeled: false,
             canvasManager: null,
             zoomLevel: 7,
-            activeNodeId: null,
         };
     },
     props: {
@@ -101,19 +100,21 @@ export default {
         onActivate(nodeId) {
             console.log("onNodeId", nodeId);
             if (this.activeNodeId != nodeId) {
-                this.activeNodeId = nodeId;
+                this.$store.commit("setActiveNode", nodeId);
                 this.canvasManager.drawOverview();
-                this.$emit("onActiveNode", nodeId);
             }
         },
         onDeactivate() {
-            this.activeNodeId = null;
+            this.$store.commit("setActiveNode", null);
         },
         onRemove(nodeId) {
             this.$emit("onRemove", nodeId);
         },
     },
     computed: {
+        activeNodeId() {
+            return this.$store.getters.getActiveNode();
+        },
         checkWheeled() {
             if (this.canvasManager != null) {
                 return this.canvasManager.isWheeled;
diff --git a/client/src/store/workflowEditorStateStore.js b/client/src/store/workflowEditorStateStore.js
index a2d868e762d..ff9c95aa972 100644
--- a/client/src/store/workflowEditorStateStore.js
+++ b/client/src/store/workflowEditorStateStore.js
@@ -2,6 +2,7 @@ export const state = {
     inputTerminals: {},
     outputTerminals: {},
     connections: {},
+    activeNode: null,
 };
 
 import Vue from "vue";
@@ -12,18 +13,18 @@ const getters = {
     getOutputTerminal: (state) => (outputTerminalId) => {
         return state.outputTerminals[outputTerminalId];
     },
+    getActiveNode: (state) => () => {
+        return state.activeNode;
+    },
 };
 
 const actions = {};
 
 const mutations = {
     setInputTerminal: (state, { inputTerminalId, inputTerminal }) => {
-        // TODO: Need to find a better inputTerminalId, terminal.id is just undefined
-        console.log(inputTerminalId);
         Vue.set(state.inputTerminals, inputTerminalId, inputTerminal);
     },
     setOutputTerminal: (state, { outputTerminalId, outputTerminal }) => {
-        console.log(outputTerminal);
         Vue.set(state.outputTerminals, outputTerminalId, outputTerminal);
     },
     setConnection: (state, { source, target, connection }) => {
@@ -33,6 +34,9 @@ const mutations = {
             state.connections[source][target] = connection;
         }
     },
+    setActiveNode: (state, nodeId) => {
+        state.activeNode = nodeId;
+    },
 };
 
 export const workflowStateStore = {