From 636a19fc50a3644a5a160ea3a564b37bfac449ec Mon Sep 17 00:00:00 2001
From: Shantur Rathore <i@shantur.com>
Date: Wed, 3 Dec 2025 22:12:16 +0000
Subject: [PATCH] Move remote connect button to tab bar edge

---
 packages/ui/src/components/instance-tabs.tsx | 24 +++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/ui/src/components/instance-tabs.tsx b/packages/ui/src/components/instance-tabs.tsx
index f56321d1..db496f27 100644
--- a/packages/ui/src/components/instance-tabs.tsx
+++ b/packages/ui/src/components/instance-tabs.tsx
@@ -19,7 +19,7 @@ const InstanceTabs: Component<InstanceTabsProps> = (props) => {
     <div class="tab-bar tab-bar-instance">
       <div class="tab-container" role="tablist">
         <div class="tab-scroll flex items-center gap-3 overflow-x-auto w-full">
-          <div class="flex items-center gap-1">
+          <div class="flex items-center gap-1 flex-1 min-w-0">
             <For each={Array.from(props.instances.entries())}>
               {([id, instance]) => (
                 <InstanceTab
@@ -38,6 +38,17 @@ const InstanceTabs: Component<InstanceTabsProps> = (props) => {
             >
               <Plus class="w-4 h-4" />
             </button>
+          </div>
+          <div class="flex items-center gap-2 flex-shrink-0 ml-auto">
+            <Show when={Array.from(props.instances.entries()).length > 1}>
+              <div>
+                <KeyboardHint
+                  shortcuts={[keyboardRegistry.get("instance-prev")!, keyboardRegistry.get("instance-next")!].filter(
+                    Boolean,
+                  )}
+                />
+              </div>
+            </Show>
             <Show when={Boolean(props.onOpenRemoteAccess)}>
               <button
                 class="new-tab-button"
@@ -47,19 +58,10 @@ const InstanceTabs: Component<InstanceTabsProps> = (props) => {
               >
                 <Cast class="w-4 h-4" />
               </button>
-
             </Show>
           </div>
-          <Show when={Array.from(props.instances.entries()).length > 1}>
-            <div class="flex-shrink-0 ml-auto pl-4">
-              <KeyboardHint
-                shortcuts={[keyboardRegistry.get("instance-prev")!, keyboardRegistry.get("instance-next")!].filter(
-                  Boolean,
-                )}
-              />
-            </div>
-          </Show>
         </div>
+
       </div>
     </div>
   )