From c77c3fe3e32d3f6ca6ac363f41569efe510d67fa Mon Sep 17 00:00:00 2001
From: Jinjing <6427696+AmethystLiang@users.noreply.github.com>
Date: Sun, 25 Oct 2026 15:22:23 -0700
Subject: [PATCH] Stabilize sidebar activity toggle placement (#33648)

---
 .../src/components/sidebar/SidebarHeader.tsx  |  6 ++----
 .../sidebar/sidebar-header-actions.tsx        | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/renderer/src/components/sidebar/SidebarHeader.tsx b/src/renderer/src/components/sidebar/SidebarHeader.tsx
index b87ea8a056d..3195e76cbc0 100644
--- a/src/renderer/src/components/sidebar/SidebarHeader.tsx
+++ b/src/renderer/src/components/sidebar/SidebarHeader.tsx
@@ -56,7 +56,7 @@ const SidebarHeader = React.memo(function SidebarHeader({
   )
 
   return (
-    <div className="mt-2 flex h-8 min-w-0 items-center justify-between gap-1.5 px-2">
+    <div className="mt-2 flex h-8 min-w-0 shrink-0 items-center justify-between gap-1.5 px-2">
       <div className="flex min-w-0 items-center gap-1">
         <span
           // Truncate localized titles because fixed-width actions cannot shrink inside the short header row.
@@ -163,12 +163,10 @@ const SidebarHeader = React.memo(function SidebarHeader({
             </div>
           </PopoverContent>
         </Popover>
-        {agentsViewActive ? (
-          <div ref={activityOptionsTarget} className="flex items-center" />
-        ) : null}
         <SidebarHeaderActions
           onWorkspaceBoardMenuOpenChange={onWorkspaceBoardMenuOpenChange}
           agentsViewActive={agentsViewActive}
+          activityOptionsTarget={activityOptionsTarget}
         />
       </div>
     </div>
diff --git a/src/renderer/src/components/sidebar/sidebar-header-actions.tsx b/src/renderer/src/components/sidebar/sidebar-header-actions.tsx
index 48a682c446f..9462c0212e6 100644
--- a/src/renderer/src/components/sidebar/sidebar-header-actions.tsx
+++ b/src/renderer/src/components/sidebar/sidebar-header-actions.tsx
@@ -78,20 +78,23 @@ function NewWorkspaceButton({
 
 export function SidebarHeaderActions({
   onWorkspaceBoardMenuOpenChange,
-  agentsViewActive = false
+  agentsViewActive = false,
+  activityOptionsTarget
 }: {
   onWorkspaceBoardMenuOpenChange: (open: boolean) => void
   agentsViewActive?: boolean
+  activityOptionsTarget?: React.Ref<HTMLDivElement>
 }): React.JSX.Element {
   return (
     <div className="flex shrink-0 items-center gap-1" data-sidebar-header-actions="">
-      {/* Activity portals its own options into this slot; retain Add project to avoid shifting other controls. */}
-      {agentsViewActive ? null : (
-        <SidebarWorkspaceOptionsMenu
-          preserveWorkspaceBoardOpen
-          onMenuOpenChange={onWorkspaceBoardMenuOpenChange}
-        />
-      )}
+      <div ref={activityOptionsTarget} className="flex size-6 shrink-0 items-center">
+        {agentsViewActive ? null : (
+          <SidebarWorkspaceOptionsMenu
+            preserveWorkspaceBoardOpen
+            onMenuOpenChange={onWorkspaceBoardMenuOpenChange}
+          />
+        )}
+      </div>
       <AddProjectButton preserveWorkspaceBoardOpen />
       <NewWorkspaceButton preserveWorkspaceBoardOpen />
     </div>