diff --git a/src/App.vue b/src/App.vue
index ce1c49e93d..8c4fe193c2 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -378,9 +378,10 @@ async function reconnectRestoredTabs() {
 }
 
 function handleContextMenu(e: MouseEvent) {
-  if (!(e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement)) {
-    e.preventDefault();
-  }
+  const target = e.target as HTMLElement;
+  if (target instanceof HTMLInputElement || target instanceof HTMLTextAreaElement) return;
+  if (target.closest("[data-radix-vue-collection-item], [data-context-menu]")) return;
+  e.preventDefault();
 }
 
 onMounted(async () => {
diff --git a/src/components/layout/AppTabBar.vue b/src/components/layout/AppTabBar.vue
index 2d9ab1e3da..86ce55be05 100644
--- a/src/components/layout/AppTabBar.vue
+++ b/src/components/layout/AppTabBar.vue
@@ -60,7 +60,7 @@ watch(
       @scroll="updateScrollButtons"
     >
       <ContextMenu v-for="tab in queryStore.tabs" :key="tab.id">
-        <ContextMenuTrigger as-child>
+        <ContextMenuTrigger class="h-full">
           <Tooltip>
             <TooltipTrigger as-child>
               <div