From 6fce7254e72a631d2f630b80219a670da46b84f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Oberm=C3=BCller?= <thomas.obermueller@gmail.com>
Date: Mon, 18 May 2026 17:48:00 +0200
Subject: [PATCH 1/3] feat: allow using typed branch name directly

---
 .../components/BranchSelector.tsx             | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/apps/code/src/renderer/features/git-interaction/components/BranchSelector.tsx b/apps/code/src/renderer/features/git-interaction/components/BranchSelector.tsx
index 0ea81f965..1f0c1c320 100644
--- a/apps/code/src/renderer/features/git-interaction/components/BranchSelector.tsx
+++ b/apps/code/src/renderer/features/git-interaction/components/BranchSelector.tsx
@@ -5,6 +5,7 @@ import { invalidateGitBranchQueries } from "@features/git-interaction/utils/gitC
 import {
   ArrowClockwise,
   CaretDown,
+  Check,
   GitBranch,
   Plus,
   Spinner,
@@ -175,6 +176,16 @@ export function BranchSelector({
 
   const isDisabled = !!(disabled || !repoPath || cloudStillLoading);
   const inputValue = isCloudMode ? (cloudSearchQuery ?? "") : searchQuery;
+  const trimmedInputValue = inputValue.trim();
+  const canUseInputBranch =
+    !isDisabled &&
+    trimmedInputValue.length > 0 &&
+    trimmedInputValue !== displayedBranch;
+
+  const handleUseInputBranch = () => {
+    if (!canUseInputBranch) return;
+    handleBranchChange(trimmedInputValue);
+  };
 
   return (
     <Combobox
@@ -237,8 +248,40 @@ export function BranchSelector({
             <ComboboxInput
               placeholder="Search branches..."
               showTrigger={false}
+              onKeyDownCapture={(event) => {
+                if (
+                  event.key !== "Enter" ||
+                  event.nativeEvent.isComposing ||
+                  !canUseInputBranch
+                ) {
+                  return;
+                }
+
+                event.preventDefault();
+                event.stopPropagation();
+                handleUseInputBranch();
+              }}
             />
           </div>
+          <Tooltip content="Use this branch name" side="bottom">
+            <Button
+              variant="outline"
+              size="sm"
+              disabled={!canUseInputBranch}
+              aria-label="Use this branch name"
+              onMouseDown={(event) => {
+                event.preventDefault();
+                event.stopPropagation();
+              }}
+              onClick={(event) => {
+                event.preventDefault();
+                event.stopPropagation();
+                handleUseInputBranch();
+              }}
+            >
+              <Check size={14} />
+            </Button>
+          </Tooltip>
           {onRefresh ? (
             <Button
               variant="outline"

From a0d08f7e7deed965e58df4d5fe9324b02d1fd10b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Oberm=C3=BCller?= <thomas.obermueller@gmail.com>
Date: Mon, 18 May 2026 17:51:53 +0200
Subject: [PATCH 2/3] add comment

---
 .../features/git-interaction/components/BranchSelector.tsx       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/code/src/renderer/features/git-interaction/components/BranchSelector.tsx b/apps/code/src/renderer/features/git-interaction/components/BranchSelector.tsx
index 1f0c1c320..701dff8a8 100644
--- a/apps/code/src/renderer/features/git-interaction/components/BranchSelector.tsx
+++ b/apps/code/src/renderer/features/git-interaction/components/BranchSelector.tsx
@@ -270,6 +270,7 @@ export function BranchSelector({
               disabled={!canUseInputBranch}
               aria-label="Use this branch name"
               onMouseDown={(event) => {
+                // Keep focus inside the combobox so the popover doesn't close before click.
                 event.preventDefault();
                 event.stopPropagation();
               }}

From 2b1ae06defe6ebe982b929392b59545972ea1c41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20Oberm=C3=BCller?= <thomas.obermueller@gmail.com>
Date: Mon, 18 May 2026 20:05:14 +0200
Subject: [PATCH 3/3] dont override selected list item

---
 .../features/git-interaction/components/BranchSelector.tsx   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/code/src/renderer/features/git-interaction/components/BranchSelector.tsx b/apps/code/src/renderer/features/git-interaction/components/BranchSelector.tsx
index 701dff8a8..e107cb244 100644
--- a/apps/code/src/renderer/features/git-interaction/components/BranchSelector.tsx
+++ b/apps/code/src/renderer/features/git-interaction/components/BranchSelector.tsx
@@ -257,6 +257,11 @@ export function BranchSelector({
                   return;
                 }
 
+                // If the combobox already has a highlighted item, let Base UI select it.
+                if (event.currentTarget.getAttribute("aria-activedescendant")) {
+                  return;
+                }
+
                 event.preventDefault();
                 event.stopPropagation();
                 handleUseInputBranch();