diff --git a/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_scriptshelf.json b/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_scriptshelf.json
index f45377c8b4..2dfce906b7 100644
--- a/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_scriptshelf.json
+++ b/openpype/settings/entities/schemas/projects_schema/schemas/schema_houdini_scriptshelf.json
@@ -5,78 +5,85 @@
     "is_group": true,
     "use_label_wrap": true,
     "object_type": {
-        "type": "dict",
-        "children": [
+        "type": "dict-conditional",
+        "enum_key": "options",
+        "enum_label": "Options",
+        "enum_children": [
             {
-                "type": "label",
-                "label": "Option 1: Add a .shelf file"
+
+                "key": "add_shelf_file",
+                "label": "Add a .shelf file",
+                "children": [
+                    {
+                        "type": "path",
+                        "key": "shelf_set_source_path",
+                        "label": "Shelf Set Path",
+                        "multipath": false,
+                        "multiplatform": true
+                    }
+                ]
             },
             {
-                "type": "path",
-                "key": "shelf_set_source_path",
-                "label": "Shelf Set Path",
-                "multipath": false,
-                "multiplatform": true
-            },
-            {
-                "type": "label",
-                "label": "<strong>OR</strong> Option 2: Add Shelf Set Name and Shelves Definitions"
-            },
-            {
-                "type": "text",
-                "key": "shelf_set_name",
-                "label": "Shelf Set Name"
-            },
-            {
-                "type": "list",
-                "key": "shelf_definition",
-                "label": "Shelves Definitions",
-                "use_label_wrap": true,
-                "object_type": {
-                    "type": "dict",
-                    "children": [
-                        {
-                            "type": "text",
-                            "key": "shelf_name",
-                            "label": "Shelf Name"
-                        },
-                        {
-                            "type": "list",
-                            "key": "tools_list",
-                            "label": "Tools",
-                            "use_label_wrap": true,
-                            "object_type": {
-                                "type": "dict",
-                                "children": [
-                                    {
-                                        "type": "label",
-                                        "label": "Name and Script Path are mandatory."
-                                    },
-                                    {
-                                        "type": "text",
-                                        "key": "label",
-                                        "label": "Name"
-                                    },
-                                    {
-                                        "type": "path",
-                                        "key": "script",
-                                        "label": "Script"
-                                    },
-                                    {
-                                        "type": "path",
-                                        "key": "icon",
-                                        "label": "Icon"
-                                    },
-                                    {
-                                        "type": "text",
-                                        "key": "help",
-                                        "label": "Help"
+                "key": "add_set_and_definitions",
+                "label": "Add Shelf Set Name and Shelves Definitions",
+                "children": [
+                    {
+                        "type": "text",
+                        "key": "shelf_set_name",
+                        "label": "Shelf Set Name"
+                    },
+                    {
+                        "type": "list",
+                        "key": "shelf_definition",
+                        "label": "Shelves Definitions",
+                        "use_label_wrap": true,
+                        "object_type": {
+                            "type": "dict",
+                            "children": [
+                                {
+                                    "type": "text",
+                                    "key": "shelf_name",
+                                    "label": "Shelf Name"
+                                },
+                                {
+                                    "type": "list",
+                                    "key": "tools_list",
+                                    "label": "Tools",
+                                    "use_label_wrap": true,
+                                    "object_type": {
+                                        "type": "dict",
+                                        "children": [
+                                            {
+                                                "type": "label",
+                                                "label": "Name and Script Path are mandatory."
+                                            },
+                                            {
+                                                "type": "text",
+                                                "key": "label",
+                                                "label": "Name"
+                                            },
+                                            {
+                                                "type": "path",
+                                                "key": "script",
+                                                "label": "Script"
+                                            },
+                                            {
+                                                "type": "path",
+                                                "key": "icon",
+                                                "label": "Icon"
+                                            },
+                                            {
+                                                "type": "text",
+                                                "key": "help",
+                                                "label": "Help"
+                                            }
+                                        ]
                                     }
-                                ]
-                            }
+                                }
+                            ]
                         }
-                    ]
-                }
+                    }
+                ]
             }
         ]
     }
diff --git a/server_addon/houdini/server/settings/shelves.py b/server_addon/houdini/server/settings/shelves.py
index e02ddf1c34..651af27537 100644
--- a/server_addon/houdini/server/settings/shelves.py
+++ b/server_addon/houdini/server/settings/shelves.py
@@ -21,9 +21,20 @@ class ShelfDefinitionModel(BaseSettingsModel):
         title="Shelf Tools"
     )
 
+def shelves_enum_options():
+    return [
+        {"value": "add_shelf_file", "label": "Add a .shelf file"},
+        {"value": "add_set_and_definitions", "label": "Add Shelf Set Name and Shelves Definitions"}
+    ]
 
 class ShelvesModel(BaseSettingsModel):
     _layout = "expanded"
+    options: str = Field(
+        title="Options",
+        description="Switch between shelves manager options",
+        enum_resolver=shelves_enum_options,
+        conditionalEnum=True
+    )
     shelf_set_source_path: MultiplatformPathModel = Field(
         default_factory=MultiplatformPathModel,
         title="Shelf Set Path",