diff --git a/app/templates/local_workspace.html b/app/templates/local_workspace.html
index 60ec5f9..7a7d38c 100644
--- a/app/templates/local_workspace.html
+++ b/app/templates/local_workspace.html
@@ -784,21 +784,25 @@
       </div>
     </template>
     <div x-show="(ctxMenu.tags||[]).length === 0" style="padding:2px 14px;font-size:11px;color:var(--text-dim);">No tags</div>
-    <div class="ctx-sep" x-show="ctxAvailTags.length > 0"></div>
-    <!-- Available tags to add -->
-    <div x-show="ctxAvailTags.length > 0" style="padding:0 0 4px;">
-      <div style="padding:2px 14px;font-size:11px;color:var(--text-dim);">Add tag:</div>
+    <div class="ctx-sep"></div>
+    <!-- Add existing tag → sub-menu -->
+    <div class="ctx-item ctx-has-sub" @click.stop="ctxTagExistingOpen=!ctxTagExistingOpen" x-show="ctxAvailTags.length > 0">
+      <span style="flex:1;">📋 Add existing tag</span>
+      <span x-text="ctxTagExistingOpen ? '▾' : '▸'"></span>
+    </div>
+    <div x-show="ctxTagExistingOpen && ctxAvailTags.length > 0" style="padding:0 0 4px;background:var(--bg-tertiary);border-radius:6px;margin:2px 6px;">
       <template x-for="t in ctxAvailTags" :key="'ctx-avail'+t.id">
-        <div class="ctx-item ctx-add-tag-item" @click.stop="ctxAddExistingTag(t)">
+        <div class="ctx-item ctx-add-tag-item" @click.stop="ctxAddExistingTag(t); ctxTagExistingOpen=false">
           <span class="ctx-tag-color" :style="{background: t.color}"></span>
           <span style="flex:1;font-size:13px;" x-text="t.name"></span>
           <span style="font-size:10px;color:var(--text-dim);" x-text="t.count||''"></span>
         </div>
       </template>
     </div>
-    <div class="ctx-tag-add" x-show="!ctxTagAdding" @click.stop="ctxTagAdding=true">
-      <span class="ctx-tag-color" style="background:var(--bg-tertiary);border:1px dashed var(--border);"></span>
-      + New tag
+    <!-- Create new tag -->
+    <div class="ctx-item ctx-has-sub" @click.stop="ctxTagAdding=!ctxTagAdding">
+      <span style="flex:1;">➕ New tag</span>
+      <span x-text="ctxTagAdding ? '▾' : '▸'"></span>
     </div>
     <div x-show="ctxTagAdding" style="display:flex;align-items:center;gap:4px;padding:4px 14px;">
       <template x-for="c in ctxTagColors" :key="c">
@@ -899,6 +903,7 @@ document.addEventListener('alpine:init', function() {
     // Context menu
     ctxMenu: {visible:false,x:0,y:0,node:null,tags:[]},
     ctxTagAdding: false,
+    ctxTagExistingOpen: false,
     ctxAvailTags: [],
     ctxNewTagColor: '#787774',
     ctxTagColors: ['#787774','#E03E3E','#D9730D','#DFAB01','#0F7B6C','#0B6E99','#6940A5','#AD1A72','#E16259','#D4A72C','#448361','#337EA9','#9065B0','#C94D8B'],
@@ -1263,6 +1268,7 @@ document.addEventListener('alpine:init', function() {
         tags: [...(node.tags||[])]
       };
       this.ctxTagAdding = false;
+      this.ctxTagExistingOpen = false;
       this.ctxNewTagColor = '#787774';
       // Load available tags (not already on the item)
       this.ctxAvailTags = (this.workspaceTags || []).filter(function(t) {