diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py
index e9b4151314e..185f3a51066 100644
--- a/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -8094,6 +8094,58 @@ def km_3d_view_tool_edit_curve_extrude_to_cursor(params):
 # ------------------------------------------------------------------------------
 # Tool System (3D View, Sculpt)
 
+def km_3d_view_tool_sculpt_box_mask(params):
+    return (
+        "3D View Tool: Sculpt, Box Mask",
+        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+        {"items": [
+            ("paint.mask_box_gesture", params.tool_maybe_tweak_event,
+             {"properties": [("value", 1.0)]}),
+            ("paint.mask_box_gesture", {**params.tool_maybe_tweak_event, "ctrl": True},
+             {"properties": [("value", 0.0)]}),
+        ]},
+    )
+
+
+def km_3d_view_tool_sculpt_lasso_mask(params):
+    return (
+        "3D View Tool: Sculpt, Lasso Mask",
+        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+        {"items": [
+            ("paint.mask_lasso_gesture", params.tool_maybe_tweak_event,
+             {"properties": [("value", 1.0)]}),
+            ("paint.mask_lasso_gesture", {**params.tool_maybe_tweak_event, "ctrl": True},
+             {"properties": [("value", 0.0)]}),
+        ]},
+    )
+
+
+def km_3d_view_tool_sculpt_line_mask(params):
+    return (
+        "3D View Tool: Sculpt, Line Mask",
+        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+        {"items": [
+            ("paint.mask_line_gesture", params.tool_maybe_tweak_event,
+             {"properties": [("value", 1.0)]}),
+            ("paint.mask_line_gesture", {**params.tool_maybe_tweak_event, "ctrl": True},
+             {"properties": [("value", 0.0)]}),
+        ]},
+    )
+
+
+def km_3d_view_tool_sculpt_polyline_mask(params):
+    return (
+        "3D View Tool: Sculpt, Polyline Mask",
+        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
+        {"items": [
+            ("paint.mask_polyline_gesture", {"type": params.tool_mouse, "value": "PRESS"},
+             {"properties": [("value", 1.0)]}),
+            ("paint.mask_polyline_gesture", {"type": params.tool_mouse, "value": "PRESS", "ctrl": True},
+             {"properties": [("value", 0.0)]}),
+        ]},
+    )
+
+
 def km_3d_view_tool_sculpt_box_hide(params):
     return (
         "3D View Tool: Sculpt, Box Hide",
@@ -8152,45 +8204,6 @@ def km_3d_view_tool_sculpt_polyline_hide(params):
     )
 
 
-def km_3d_view_tool_sculpt_box_mask(params):
-    return (
-        "3D View Tool: Sculpt, Box Mask",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("paint.mask_box_gesture", params.tool_maybe_tweak_event,
-             {"properties": [("value", 1.0)]}),
-            ("paint.mask_box_gesture", {**params.tool_maybe_tweak_event, "ctrl": True},
-             {"properties": [("value", 0.0)]}),
-        ]},
-    )
-
-
-def km_3d_view_tool_sculpt_lasso_mask(params):
-    return (
-        "3D View Tool: Sculpt, Lasso Mask",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("paint.mask_lasso_gesture", params.tool_maybe_tweak_event,
-             {"properties": [("value", 1.0)]}),
-            ("paint.mask_lasso_gesture", {**params.tool_maybe_tweak_event, "ctrl": True},
-             {"properties": [("value", 0.0)]}),
-        ]},
-    )
-
-
-def km_3d_view_tool_sculpt_polyline_mask(params):
-    return (
-        "3D View Tool: Sculpt, Polyline Mask",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("paint.mask_polyline_gesture", {"type": params.tool_mouse, "value": "PRESS"},
-             {"properties": [("value", 1.0)]}),
-            ("paint.mask_polyline_gesture", {"type": params.tool_mouse, "value": "PRESS", "ctrl": True},
-             {"properties": [("value", 0.0)]}),
-        ]},
-    )
-
-
 def km_3d_view_tool_sculpt_box_face_set(params):
     return (
         "3D View Tool: Sculpt, Box Face Set",
@@ -8271,19 +8284,6 @@ def km_3d_view_tool_sculpt_polyline_trim(params):
     )
 
 
-def km_3d_view_tool_sculpt_line_mask(params):
-    return (
-        "3D View Tool: Sculpt, Line Mask",
-        {"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
-        {"items": [
-            ("paint.mask_line_gesture", params.tool_maybe_tweak_event,
-             {"properties": [("value", 1.0)]}),
-            ("paint.mask_line_gesture", {**params.tool_maybe_tweak_event, "ctrl": True},
-             {"properties": [("value", 0.0)]}),
-        ]},
-    )
-
-
 def km_3d_view_tool_sculpt_line_project(params):
     return (
         "3D View Tool: Sculpt, Line Project",
@@ -9233,13 +9233,14 @@ def generate_keymaps(params=None):
         km_3d_view_tool_edit_curve_extrude(params),
         km_3d_view_tool_edit_curve_extrude_to_cursor(params),
         km_3d_view_tool_edit_curves_draw(params),
+        km_3d_view_tool_sculpt_box_mask(params),
+        km_3d_view_tool_sculpt_lasso_mask(params),
+        km_3d_view_tool_sculpt_line_mask(params),
+        km_3d_view_tool_sculpt_polyline_mask(params),
         km_3d_view_tool_sculpt_box_hide(params),
         km_3d_view_tool_sculpt_lasso_hide(params),
         km_3d_view_tool_sculpt_line_hide(params),
         km_3d_view_tool_sculpt_polyline_hide(params),
-        km_3d_view_tool_sculpt_box_mask(params),
-        km_3d_view_tool_sculpt_lasso_mask(params),
-        km_3d_view_tool_sculpt_polyline_mask(params),
         km_3d_view_tool_sculpt_box_face_set(params),
         km_3d_view_tool_sculpt_lasso_face_set(params),
         km_3d_view_tool_sculpt_line_face_set(params),
@@ -9248,7 +9249,6 @@ def generate_keymaps(params=None):
         km_3d_view_tool_sculpt_lasso_trim(params),
         km_3d_view_tool_sculpt_line_trim(params),
         km_3d_view_tool_sculpt_polyline_trim(params),
-        km_3d_view_tool_sculpt_line_mask(params),
         km_3d_view_tool_sculpt_line_project(params),
         km_3d_view_tool_sculpt_mesh_filter(params),
         km_3d_view_tool_sculpt_cloth_filter(params),
diff --git a/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 363a16ed290..26243382c68 100644
--- a/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1410,66 +1410,6 @@ class _defs_sculpt:
             use_separators=False,
         )
 
-    @ToolDef.from_fn
-    def hide_border():
-        def draw_settings(_context, layout, tool):
-            props = tool.operator_properties("paint.hide_show")
-            layout.prop(props, "area", expand=False)
-
-        return dict(
-            idname="builtin.box_hide",
-            label="Box Hide",
-            icon="ops.sculpt.border_hide",
-            widget=None,
-            keymap=(),
-            draw_settings=draw_settings,
-        )
-
-    @ToolDef.from_fn
-    def hide_lasso():
-        def draw_settings(_context, layout, tool):
-            props = tool.operator_properties("paint.hide_show_lasso_gesture")
-            layout.prop(props, "area", expand=False)
-
-        return dict(
-            idname="builtin.lasso_hide",
-            label="Lasso Hide",
-            icon="ops.sculpt.lasso_hide",
-            widget=None,
-            keymap=(),
-            draw_settings=draw_settings,
-        )
-
-    @ToolDef.from_fn
-    def hide_line():
-        def draw_settings(_context, layout, tool):
-            props = tool.operator_properties("paint.hide_show_line_gesture")
-            layout.prop(props, "use_limit_to_segment", expand=False)
-
-        return dict(
-            idname="builtin.line_hide",
-            label="Line Hide",
-            icon="ops.sculpt.line_hide",
-            widget=None,
-            keymap=(),
-            draw_settings=draw_settings,
-        )
-
-    @ToolDef.from_fn
-    def hide_polyline():
-        def draw_settings(_context, layout, tool):
-            props = tool.operator_properties("paint.hide_show_polyline_gesture")
-            layout.prop(props, "area", expand=False)
-
-        return dict(
-            idname="builtin.polyline_hide",
-            label="Polyline Hide",
-            icon="ops.sculpt.polyline_hide",
-            widget=None,
-            keymap=(),
-            draw_settings=draw_settings,
-        )
-
     @ToolDef.from_fn
     def mask_border():
         def draw_settings(_context, layout, tool):
@@ -1531,6 +1471,66 @@ class _defs_sculpt:
             draw_settings=draw_settings,
         )
 
+    @ToolDef.from_fn
+    def hide_border():
+        def draw_settings(_context, layout, tool):
+            props = tool.operator_properties("paint.hide_show")
+            layout.prop(props, "area", expand=False)
+
+        return dict(
+            idname="builtin.box_hide",
+            label="Box Hide",
+            icon="ops.sculpt.border_hide",
+            widget=None,
+            keymap=(),
+            draw_settings=draw_settings,
+        )
+
+    @ToolDef.from_fn
+    def hide_lasso():
+        def draw_settings(_context, layout, tool):
+            props = tool.operator_properties("paint.hide_show_lasso_gesture")
+            layout.prop(props, "area", expand=False)
+
+        return dict(
+            idname="builtin.lasso_hide",
+            label="Lasso Hide",
+            icon="ops.sculpt.lasso_hide",
+            widget=None,
+            keymap=(),
+            draw_settings=draw_settings,
+        )
+
+    @ToolDef.from_fn
+    def hide_line():
+        def draw_settings(_context, layout, tool):
+            props = tool.operator_properties("paint.hide_show_line_gesture")
+            layout.prop(props, "use_limit_to_segment", expand=False)
+
+        return dict(
+            idname="builtin.line_hide",
+            label="Line Hide",
+            icon="ops.sculpt.line_hide",
+            widget=None,
+            keymap=(),
+            draw_settings=draw_settings,
+        )
+
+    @ToolDef.from_fn
+    def hide_polyline():
+        def draw_settings(_context, layout, tool):
+            props = tool.operator_properties("paint.hide_show_polyline_gesture")
+            layout.prop(props, "area", expand=False)
+
+        return dict(
+            idname="builtin.polyline_hide",
+            label="Polyline Hide",
+            icon="ops.sculpt.polyline_hide",
+            widget=None,
+            keymap=(),
+            draw_settings=draw_settings,
+        )
+
     @ToolDef.from_fn
     def face_set_box():
         def draw_settings(_context, layout, tool):