diff --git a/packages/node_modules/@node-red/editor-client/src/js/red.js b/packages/node_modules/@node-red/editor-client/src/js/red.js
index 99cb8375b..8866476b6 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -800,8 +800,7 @@ var RED = (function() {
             {id:"menu-item-workspace-delete",label:RED._("menu.label.delete"),onselect:"core:remove-flow"}
         ]});
         menuOptions.push({id:"menu-item-subflow",label:RED._("menu.label.subflows"), options: [
-            {id:"menu-item-subflow-create",label:RED._("menu.label.createSubflow"),onselect:"core:create-subflow"},
-            {id:"menu-item-subflow-convert",label:RED._("menu.label.selectionToSubflow"),disabled:true,onselect:"core:convert-to-subflow"},
+            {id:"menu-item-subflow-create",label:RED._("menu.label.createSubflow"),onselect:"core:create-subflow"}
         ]});
         menuOptions.push({id:"menu-item-group",label:RED._("menu.label.groups"), options: [
             {id:"menu-item-group-group",label:RED._("menu.label.groupSelection"),disabled:true,onselect:"core:group-selection"},
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 c70757dfa..eef6f5783 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
@@ -187,6 +187,13 @@ RED.contextMenu = (function () {
                     { onselect: 'core:copy-group-style', label: RED._("keyboard.copyGroupStyle"), disabled: !hasGroup },
                     { onselect: 'core:paste-group-style', label: RED._("keyboard.pasteGroupStyle"), disabled: !hasGroup}
                 )
+
+                menuItems.push({
+                    label: RED._('sidebar.info.subflow'),
+                    options: [
+                        { onselect: 'core:convert-to-subflow', label: RED._("menu.label.selectionToSubflow") },
+                    ]
+                })
             }
             if (canEdit && hasMultipleSelection) {
                 menuItems.push({
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
index 3e1b9a410..0d5512c6c 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js
@@ -574,13 +574,6 @@ RED.subflow = (function() {
                 hideWorkspaceToolbar();
             }
         });
-        RED.events.on("view:selection-changed",function(selection) {
-            if (!selection.nodes || RED.workspaces.isLocked()) {
-                RED.menu.setDisabled("menu-item-subflow-convert",true);
-            } else {
-                RED.menu.setDisabled("menu-item-subflow-convert",false);
-            }
-        });
 
         RED.actions.add("core:create-subflow",createSubflow);
         RED.actions.add("core:convert-to-subflow",convertToSubflow);