diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index dc9dce958e..7f541204ea 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -1943,14 +1943,10 @@ if (DEBUG_EVENTS) { console.warn("clearSelection", mouse_mode); }
             if (moving_set.length > 0) {
                 for (var i=0;i<moving_set.length;i++) {
                     var node = moving_set[i].n;
+                    node.selected = false;
                     if (node.type === "group") {
                         selectedGroups.push(node);
-                    }
-                }
-                for (var i=0;i<moving_set.length;i++) {
-                    var node = moving_set[i].n;
-                    node.selected = false;
-                    if ((node.type !== "group") && (node.type != "subflow")) {
+                    } else if (node.type != "subflow") {
                         if (node.x < 0) {
                             node.x = 25
                         }
@@ -1960,14 +1956,9 @@ if (DEBUG_EVENTS) { console.warn("clearSelection", mouse_mode); }
                         removedLinks = removedLinks.concat(removedEntities.links);
                         if (node.g) {
                             var group = RED.nodes.group(node.g);
-                            if (!group.selected || group.active) {
-                                var isSelectedGroup = selectedGroups.find(function (ng) {
-                                    return (ng.id === node.g);
-                                });
-                                if (!isSelectedGroup) {
-                                    RED.group.removeFromGroup(group,node);
-                                    node.g = group.id;
-                                }
+                            if ((!group.selected || group.active) && (selectedGroups.indexOf(group) < 0)) {
+                                RED.group.removeFromGroup(group,node);
+                                node.g = group.id;
                             }
                         }
                     } else {