diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index d75143528..a8da60411 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -207,9 +207,10 @@ const extendReplacementRangeForTrailingSpace = (
 
 interface ChatViewProps {
   threadId: ThreadId;
+  tabBar?: React.ReactNode;
 }
 
-export default function ChatView({ threadId }: ChatViewProps) {
+export default function ChatView({ threadId, tabBar }: ChatViewProps) {
   const threads = useStore((store) => store.threads);
   const projects = useStore((store) => store.projects);
   const markThreadVisited = useStore((store) => store.markThreadVisited);
@@ -3625,6 +3626,8 @@ export default function ChatView({ threadId }: ChatViewProps) {
         />
       </header>
 
+      {tabBar}
+
       {/* Error banner */}
       <ProviderHealthBanner status={activeProviderStatus} />
       <ThreadErrorBanner
diff --git a/apps/web/src/routes/_chat.$threadId.$subThreadId.tsx b/apps/web/src/routes/_chat.$threadId.$subThreadId.tsx
index 8a60b7def..ff3caf898 100644
--- a/apps/web/src/routes/_chat.$threadId.$subThreadId.tsx
+++ b/apps/web/src/routes/_chat.$threadId.$subThreadId.tsx
@@ -196,8 +196,7 @@ function ChatSubThreadRouteView() {
     return (
       <>
         <SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground">
-          {tabBar}
-          <ChatView key={`${threadId}:${subThreadId}`} threadId={threadId} />
+          <ChatView key={`${threadId}:${subThreadId}`} threadId={threadId} tabBar={tabBar} />
         </SidebarInset>
         <DiffPanelInlineSidebar
           diffOpen={diffOpen}
@@ -212,8 +211,7 @@ function ChatSubThreadRouteView() {
   return (
     <>
       <SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground">
-        {tabBar}
-        <ChatView key={`${threadId}:${subThreadId}`} threadId={threadId} />
+        <ChatView key={`${threadId}:${subThreadId}`} threadId={threadId} tabBar={tabBar} />
       </SidebarInset>
       <DiffPanelSheet diffOpen={diffOpen} onCloseDiff={closeDiff}>
         {shouldRenderDiffContent ? <LazyDiffPanel mode="sheet" /> : null}