diff --git a/src/components/graph/SelectionToolbox.vue b/src/components/graph/SelectionToolbox.vue
index 2b0b842486..d0acf8d7fe 100644
--- a/src/components/graph/SelectionToolbox.vue
+++ b/src/components/graph/SelectionToolbox.vue
@@ -3,61 +3,85 @@
     class="selection-toolbox absolute left-1/2 rounded-lg"
     :pt="{
       header: 'hidden',
-      content: 'p-0 flex flex-row'
+      content: 'p-0'
     }"
   >
-    <ColorPickerButton v-show="nodeSelected || groupSelected" />
-    <Button
-      v-show="nodeSelected"
-      severity="secondary"
-      text
-      @click="
-        () => commandStore.execute('Comfy.Canvas.ToggleSelectedNodes.Bypass')
-      "
-      data-testid="bypass-button"
-    >
-      <template #icon>
-        <i-game-icons:detour />
-      </template>
-    </Button>
-    <Button
-      v-show="nodeSelected || groupSelected"
-      severity="secondary"
-      text
-      icon="pi pi-thumbtack"
-      @click="() => commandStore.execute('Comfy.Canvas.ToggleSelected.Pin')"
-    />
-    <NodeModelsButton
-      v-if="modelNodeSelected && canvasStore.selectedItems.length === 1"
-    />
-    <Button
-      severity="danger"
-      text
-      icon="pi pi-trash"
-      @click="() => commandStore.execute('Comfy.Canvas.DeleteSelectedItems')"
-    />
-    <Button
-      v-show="isRefreshable"
-      severity="info"
-      text
-      icon="pi pi-refresh"
-      @click="refreshSelected"
-    />
-    <Button
-      v-for="command in extensionToolboxCommands"
-      :key="command.id"
-      severity="secondary"
-      text
-      :icon="typeof command.icon === 'function' ? command.icon() : command.icon"
-      @click="() => commandStore.execute(command.id)"
-    />
+    <div class="flex flex-col">
+      <div class="flex flex-row">
+        <ColorPickerButton v-show="nodeSelected || groupSelected" />
+        <Button
+          v-show="nodeSelected"
+          severity="secondary"
+          text
+          @click="
+            () =>
+              commandStore.execute('Comfy.Canvas.ToggleSelectedNodes.Bypass')
+          "
+          data-testid="bypass-button"
+        >
+          <template #icon>
+            <i-game-icons:detour />
+          </template>
+        </Button>
+        <Button
+          v-show="nodeSelected || groupSelected"
+          severity="secondary"
+          text
+          icon="pi pi-thumbtack"
+          @click="() => commandStore.execute('Comfy.Canvas.ToggleSelected.Pin')"
+        />
+        <Button
+          severity="danger"
+          text
+          icon="pi pi-trash"
+          @click="
+            () => commandStore.execute('Comfy.Canvas.DeleteSelectedItems')
+          "
+        />
+        <Button
+          v-show="isRefreshable"
+          severity="info"
+          text
+          icon="pi pi-refresh"
+          @click="refreshSelected"
+        />
+        <Button
+          v-for="command in extensionToolboxCommands"
+          :key="command.id"
+          severity="secondary"
+          text
+          :icon="
+            typeof command.icon === 'function' ? command.icon() : command.icon
+          "
+          @click="() => commandStore.execute(command.id)"
+        />
+        <Divider
+          layout="vertical"
+          class="mx-1 my-2"
+          v-if="hasAdvancedOptions"
+        />
+        <Button
+          v-if="hasAdvancedOptions"
+          severity="secondary"
+          text
+          :icon="showAdvancedOptions ? 'pi pi-chevron-up' : 'pi pi-ellipsis-h'"
+          @click="showAdvancedOptions = !showAdvancedOptions"
+        />
+      </div>
+      <div v-if="showAdvancedOptions" class="flex flex-row">
+        <NodeModelsButton
+          v-if="modelNodeSelected && canvasStore.selectedItems.length === 1"
+        />
+      </div>
+    </div>
   </Panel>
 </template>
 
 <script setup lang="ts">
 import Button from 'primevue/button'
+import Divider from 'primevue/divider'
 import Panel from 'primevue/panel'
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 
 import ColorPickerButton from '@/components/graph/selectionToolbox/ColorPickerButton.vue'
 import NodeModelsButton from '@/components/graph/selectionToolbox/nodeModelsMetadata/NodeModelsButton.vue'
@@ -71,6 +95,8 @@ const commandStore = useCommandStore()
 const canvasStore = useCanvasStore()
 const extensionService = useExtensionService()
 const { isRefreshable, refreshSelected } = useRefreshableSelection()
+const showAdvancedOptions = ref(false)
+
 const selectedNodes = computed(() =>
   canvasStore.selectedItems.filter(isLGraphNode)
 )
@@ -84,6 +110,11 @@ const nodeSelected = computed(() => selectedNodes.value.length > 0)
 const groupSelected = computed(() => selectedGroups.value.length > 0)
 const modelNodeSelected = computed(() => selectedModelNodes.value.length > 0)
 
+const showModelMetadataTool = computed(
+  () => modelNodeSelected.value && canvasStore.selectedItems.length === 1
+)
+const hasAdvancedOptions = computed(() => showModelMetadataTool.value)
+
 const extensionToolboxCommands = computed<ComfyCommand[]>(() => {
   const commandIds = new Set<string>(
     canvasStore.selectedItems