diff --git a/scripts/addons_core/node_wrangler/interface.py b/scripts/addons_core/node_wrangler/interface.py
index 4fdfb370782..18bb1c52f60 100644
--- a/scripts/addons_core/node_wrangler/interface.py
+++ b/scripts/addons_core/node_wrangler/interface.py
@@ -59,7 +59,7 @@ def drawlayout(context, layout, mode='non-panel'):
     col.separator()
 
     col = layout.column(align=True)
-    col.operator(operators.NWFrameSelected.bl_idname, icon='STICKY_UVS_LOC')
+    col.operator('node.join', icon='STICKY_UVS_LOC')
     col.separator()
 
     col = layout.column(align=True)
diff --git a/scripts/addons_core/node_wrangler/operators.py b/scripts/addons_core/node_wrangler/operators.py
index ee398e16674..30142a332c3 100644
--- a/scripts/addons_core/node_wrangler/operators.py
+++ b/scripts/addons_core/node_wrangler/operators.py
@@ -493,58 +493,6 @@ class NWAddAttrNode(Operator, NWBase):
         return {'FINISHED'}
 
 
-class NWFrameSelected(Operator, NWBase):
-    bl_idname = "node.nw_frame_selected"
-    bl_label = "Frame Selected"
-    bl_translation_context = i18n_contexts.id_nodetree
-    bl_description = "Add a frame node and parent the selected nodes to it"
-    bl_options = {'REGISTER', 'UNDO'}
-
-    label_prop: StringProperty(
-        name='Label',
-        description='The visual name of the frame node',
-        default=' '
-    )
-    use_custom_color_prop: BoolProperty(
-        name="Custom Color",
-        description="Use custom color for the frame node",
-        default=False
-    )
-    color_prop: FloatVectorProperty(
-        name="Color",
-        description="The color of the frame node",
-        default=(0.604, 0.604, 0.604),
-        min=0, max=1, step=1, precision=3,
-        subtype='COLOR_GAMMA', size=3
-    )
-
-    def draw(self, context):
-        layout = self.layout
-        layout.prop(self, 'label_prop')
-        layout.prop(self, 'use_custom_color_prop')
-        col = layout.column()
-        col.active = self.use_custom_color_prop
-        col.prop(self, 'color_prop', text="")
-
-    def execute(self, context):
-        nodes, links = get_nodes_links(context)
-        selected = []
-        for node in nodes:
-            if node.select:
-                selected.append(node)
-
-        bpy.ops.node.add_node(type='NodeFrame')
-        frm = nodes.active
-        frm.label = self.label_prop
-        frm.use_custom_color = self.use_custom_color_prop
-        frm.color = self.color_prop
-
-        for node in selected:
-            node.parent = frm
-
-        return {'FINISHED'}
-
-
 class NWReloadImages(Operator):
     bl_idname = "node.nw_reload_images"
     bl_label = "Reload Images"
@@ -2450,7 +2398,6 @@ classes = (
     NWSwapLinks,
     NWResetBG,
     NWAddAttrNode,
-    NWFrameSelected,
     NWReloadImages,
     NWMergeNodes,
     NWBatchChangeNodes,
diff --git a/scripts/addons_core/node_wrangler/preferences.py b/scripts/addons_core/node_wrangler/preferences.py
index c852a5df3e6..76a01d845c2 100644
--- a/scripts/addons_core/node_wrangler/preferences.py
+++ b/scripts/addons_core/node_wrangler/preferences.py
@@ -329,7 +329,7 @@ kmi_defs = (
     # Delete unused
     (operators.NWDeleteUnused.bl_idname, 'X', 'PRESS', False, False, True, None, "Delete unused nodes"),
     # Frame Selected
-    (operators.NWFrameSelected.bl_idname, 'P', 'PRESS', False, True, False, None, "Frame selected nodes"),
+    ('node.join', 'P', 'PRESS', False, True, False, None, "Frame selected nodes"),
     # Swap Links
     (operators.NWSwapLinks.bl_idname, 'S', 'PRESS', False, False, True, None, "Swap Links"),
     # Reload Images