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 af83e2d53..094074370 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
@@ -1235,6 +1235,9 @@ RED.nodes = (function() {
                 if (defaultWorkspace == null) {
                     defaultWorkspace = n;
                 }
+                if (activeWorkspace === 0) {
+                    activeWorkspace = n.id;
+                }
                 if (createNewIds || options.importMap[n.id] === "copy") {
                     nid = getID();
                     workspace_map[n.id] = nid;
@@ -1490,6 +1493,9 @@ RED.nodes = (function() {
                                 delete node.wires;
                                 delete node.inputLabels;
                                 delete node.outputLabels;
+                                if (!n.z) {
+                                    delete node.z;
+                                }
                             }
                             var orig = {};
                             for (var p in n) {