diff --git a/src/constants/groupNodeConstants.ts b/src/constants/groupNodeConstants.ts
new file mode 100644
index 000000000..ff2cf0671
--- /dev/null
+++ b/src/constants/groupNodeConstants.ts
@@ -0,0 +1,8 @@
+/**
+ * Constants for group node type prefixes and separators
+ *
+ * v1 Prefix + Separator: workflow/
+ * v2 Prefix + Separator: workflow> (ComfyUI_frontend v1.2.63)
+ */
+export const PREFIX = 'workflow'
+export const SEPARATOR = '>'
diff --git a/src/extensions/core/groupNode.ts b/src/extensions/core/groupNode.ts
index 8b2170950..ae92cfc5b 100644
--- a/src/extensions/core/groupNode.ts
+++ b/src/extensions/core/groupNode.ts
@@ -1,3 +1,4 @@
+import { PREFIX, SEPARATOR } from '@/constants/groupNodeConstants'
 import { t } from '@/i18n'
 import { type NodeId } from '@/lib/litegraph/src/LGraphNode'
 import {
@@ -35,11 +36,6 @@ type GroupNodeWorkflowData = {
   nodes: ComfyNode[]
 }
 
-// v1 Prefix + Separator: workflow/
-// v2 Prefix + Separator: workflow> (ComfyUI_frontend v1.2.63)
-const PREFIX = 'workflow'
-const SEPARATOR = '>'
-
 const Workflow = {
   InUse: {
     Free: 0,
diff --git a/src/extensions/core/groupNodeManage.ts b/src/extensions/core/groupNodeManage.ts
index fbf04033f..15b9c95bc 100644
--- a/src/extensions/core/groupNodeManage.ts
+++ b/src/extensions/core/groupNodeManage.ts
@@ -1,3 +1,4 @@
+import { PREFIX, SEPARATOR } from '@/constants/groupNodeConstants'
 import {
   type LGraphNode,
   type LGraphNodeConstructor,
@@ -13,8 +14,6 @@ import { GroupNodeConfig, GroupNodeHandler } from './groupNode'
 import './groupNodeManage.css'
 
 const ORDER: symbol = Symbol()
-const PREFIX = 'workflow'
-const SEPARATOR = '>'
 
 // @ts-expect-error fixme ts strict error
 function merge(target, source) {
diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts
index 83a8cdcd5..3ae1e7cea 100644
--- a/src/lib/litegraph/src/LGraphCanvas.ts
+++ b/src/lib/litegraph/src/LGraphCanvas.ts
@@ -1,5 +1,6 @@
 import { toString } from 'es-toolkit/compat'
 
+import { PREFIX, SEPARATOR } from '@/constants/groupNodeConstants'
 import { LinkConnector } from '@/lib/litegraph/src/canvas/LinkConnector'
 
 import { CanvasPointer } from './CanvasPointer'
@@ -8102,7 +8103,6 @@ export class LGraphCanvas
       | IContextMenuValue<(typeof LiteGraph.VALID_SHAPES)[number]>
       | null
     )[]
-
     if (node.getMenuOptions) {
       options = node.getMenuOptions(this)
     } else {
@@ -8110,9 +8110,38 @@ export class LGraphCanvas
         {
           content: 'Convert to Subgraph 🆕',
           callback: () => {
-            if (!this.selectedItems.size)
+            // find groupnodes, degroup and select children
+            if (this.selectedItems.size) {
+              let hasGroups = false
+              for (const item of this.selectedItems) {
+                const node = item as LGraphNode
+                const isGroup =
+                  typeof node.type === 'string' &&
+                  node.type.startsWith(`${PREFIX}${SEPARATOR}`)
+                if (isGroup && node.convertToNodes) {
+                  hasGroups = true
+                  const nodes = node.convertToNodes()
+
+                  requestAnimationFrame(() => {
+                    this.selectItems(nodes, true)
+
+                    if (!this.selectedItems.size)
+                      throw new Error('Convert to Subgraph: Nothing selected.')
+                    this._graph.convertToSubgraph(this.selectedItems)
+                  })
+                  return
+                }
+              }
+
+              // If no groups were found, continue normally
+              if (!hasGroups) {
+                if (!this.selectedItems.size)
+                  throw new Error('Convert to Subgraph: Nothing selected.')
+                this._graph.convertToSubgraph(this.selectedItems)
+              }
+            } else {
               throw new Error('Convert to Subgraph: Nothing selected.')
-            this._graph.convertToSubgraph(this.selectedItems)
+            }
           }
         },
         {