diff --git a/packages/node_modules/@node-red/editor-client/src/js/history.js b/packages/node_modules/@node-red/editor-client/src/js/history.js
index 930598dd5..f0e248689 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/history.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/history.js
@@ -276,11 +276,13 @@ RED.history = (function() {
                 ev.node.changed = ev.changed;
             } else if (ev.t == "createSubflow") {
                 if (ev.nodes) {
+                    var z = ev.activeWorkspace;
                     RED.nodes.filterNodes({z:ev.subflow.subflow.id}).forEach(function(n) {
                         n.x += ev.subflow.offsetX;
                         n.y += ev.subflow.offsetY;
                         n.z = ev.activeWorkspace;
                         n.dirty = true;
+                        RED.nodes.moveNodeToTab(n, z);
                     });
                     for (i=0;i<ev.nodes.length;i++) {
                         RED.nodes.remove(ev.nodes[i]);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
index c14126a00..2a800322b 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -308,7 +308,7 @@ RED.nodes = (function() {
         if (!nodeTabMap[z]) {
             nodeTabMap[z] = {};
         }
-        nodeTabMap[z][node.iz] = node;
+        nodeTabMap[z][node.id] = node;
         node.z = z;
     }