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 1eac45494..951cb3430 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
@@ -1124,7 +1124,6 @@ RED.nodes = (function() {
                     }
                     node_map[n.id] = configNode;
                     new_nodes.push(configNode);
-                    RED.nodes.add(configNode);
                 }
             }
         }
@@ -1296,12 +1295,6 @@ RED.nodes = (function() {
                             }
                         }
                     }
-                    if (node.type !== "group") {
-                        addNode(node);
-                        RED.editor.validateNode(node);
-                    } else {
-                        addGroup(node);
-                    }
                     node_map[n.id] = node;
                     // If an 'unknown' config node, it will not have been caught by the
                     // proper config node handling, so needs adding to new_nodes here
@@ -1426,6 +1419,13 @@ RED.nodes = (function() {
             n.nodes = n.nodes.map(function(id) {
                 return node_map[id];
             })
+            addGroup(n);
+        }
+        // Now the nodes have been fully updated, add them.
+        for (i=0;i<new_nodes.length;i++) {
+            node = new_nodes[i];
+            addNode(node);
+            RED.editor.validateNode(node);
         }
 
         RED.workspaces.refresh();