diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js b/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
index dae3f6fa6..60615671e 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
@@ -32,24 +32,28 @@ RED.contextMenu = (function () {
             const canRemoveFromGroup = hasSelection && !!selection.nodes[0].g
             let hasGroup, isAllGroups = true, hasDisabledNode, hasEnabledNode, hasLabeledNode, hasUnlabeledNode;
             if (hasSelection) {
-                selection.nodes.forEach(n => {
+                const nodes = selection.nodes.slice();
+                while (nodes.length) {
+                    const n = nodes.shift();
                     if (n.type === 'group') {
                         hasGroup = true;
+                        nodes.push(...n.nodes);
                     } else {
                         isAllGroups = false;
-                    }
-                    if (n.d) {
-                        hasDisabledNode = true;
-                    } else {
-                        hasEnabledNode = true;
+                        if (n.d) {
+                            hasDisabledNode = true;
+                        } else {
+                            hasEnabledNode = true;
+                        }
                     }
                     if (n.l === undefined || n.l) {
                         hasLabeledNode = true;
                     } else {
                         hasUnlabeledNode = true;
                     }
-                });
+                }
             }
+
             const offset = $("#red-ui-workspace-chart").offset()
 
             let addX = options.x - offset.left + $("#red-ui-workspace-chart").scrollLeft()