From d67157a09c28883d7856d03d2b1d3aecdbf1b890 Mon Sep 17 00:00:00 2001
From: Adamulek123 <adam.bogucki2018@gmail.com>
Date: Tue, 8 Sep 2026 01:52:16 +0200
Subject: [PATCH] fix(web): keep ref picker steady when opening (#9472)

---
 apps/web/src/components/BranchToolbarBranchSelector.tsx | 4 +++-
 apps/web/src/components/ui/combobox.tsx                 | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx
index 94697b9592fd375591f087acd92ca44382e5281e..0dad406985a782c9e5074c1368ab84fac9f9340a 100644
--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx
+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx
@@ -774,7 +774,9 @@ export function BranchToolbarBranchSelector({
         >
           <ComboboxTrigger
             render={<Button variant="ghost" size="xs" />}
-            className="min-w-0 max-w-full font-normal text-muted-foreground/70 text-xs! hover:text-foreground/80"
+            // No press-scale: the popup aligns live to this trigger, so a
+            // momentary 0.97 shrink would drag the open popup ~3px sideways.
+            className="min-w-0 max-w-full font-normal text-muted-foreground/70 text-xs! hover:text-foreground/80 active:scale-100"
             disabled={isInitialBranchesLoadPending || isBranchActionPending}
           >
             <GitBranchIcon className="size-3 shrink-0 opacity-70" />
diff --git a/apps/web/src/components/ui/combobox.tsx b/apps/web/src/components/ui/combobox.tsx
index 59bf4d637704d010266e6a51851140d7176edb60..6437f1fc8729ef176922073385856751f8aa1dec 100644
--- a/apps/web/src/components/ui/combobox.tsx
+++ b/apps/web/src/components/ui/combobox.tsx
@@ -175,8 +175,8 @@ function ComboboxPopup({
   side?: ComboboxPrimitive.Positioner.Props["side"];
   anchor?: ComboboxPrimitive.Positioner.Props["anchor"];
 }) {
-  const { chipsRef } = React.use(ComboboxContext);
-  const anchor = anchorProp ?? chipsRef;
+  const { chipsRef, multiple } = React.use(ComboboxContext);
+  const anchor = anchorProp ?? (multiple ? chipsRef : undefined);
 
   return (
     <ComboboxPrimitive.Portal>
-- 
2.54.0