From b20bfc34b22a6e62b3c1ba689fb982739596d5c2 Mon Sep 17 00:00:00 2001
From: Shantur Rathore <i@shantur.com>
Date: Sun, 14 Dec 2025 16:36:34 +0000
Subject: [PATCH] Fix selector shortcut popovers with floating drawer

---
 .../ui/src/components/instance/instance-shell2.tsx     | 10 ++++------
 packages/ui/src/styles/components/selector.css         |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/ui/src/components/instance/instance-shell2.tsx b/packages/ui/src/components/instance/instance-shell2.tsx
index e924db58..e7d5a0b3 100644
--- a/packages/ui/src/components/instance/instance-shell2.tsx
+++ b/packages/ui/src/components/instance/instance-shell2.tsx
@@ -368,12 +368,10 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
   }
 
   const focusModelSelectorControl = () => {
-    const trigger = leftDrawerContentEl()?.querySelector<HTMLElement>(
-      "[data-model-selector-control] .selector-trigger",
-    )
-    if (!trigger) return false
-    trigger.focus()
-    setTimeout(() => triggerKeyboardEvent(trigger, { key: "ArrowDown", code: "ArrowDown", keyCode: 40 }), 10)
+    const input = leftDrawerContentEl()?.querySelector<HTMLInputElement>("[data-model-selector]")
+    if (!input) return false
+    input.focus()
+    setTimeout(() => triggerKeyboardEvent(input, { key: "ArrowDown", code: "ArrowDown", keyCode: 40 }), 10)
     return true
   }
 
diff --git a/packages/ui/src/styles/components/selector.css b/packages/ui/src/styles/components/selector.css
index 3f418a08..742b1ae0 100644
--- a/packages/ui/src/styles/components/selector.css
+++ b/packages/ui/src/styles/components/selector.css
@@ -50,7 +50,7 @@
   @apply rounded-md shadow-lg overflow-hidden min-w-[300px];
   background-color: var(--surface-base);
   border: 1px solid var(--border-base);
-  z-index: 1600;
+  z-index: 2200;
 }
 
 .selector-search-container {