diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index ba12e122..7824fbac 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -2470,9 +2470,20 @@ function App() {
                 canNavigateForward={canNavigateForward}
                 collapsedLeftPaddingPx={collapsedLeftPaddingPx}
               >
-                <span className="text-sm font-medium text-muted-foreground flex-1 min-w-0 truncate">
-                  {headerTitle}
-                </span>
+                {openTabs.length > 1 ? (
+                  <ChatTabBar
+                    tabs={openTabs}
+                    activeTabId={activeTabId}
+                    getTabTitle={getTabTitle}
+                    processingRunIds={processingRunIds}
+                    onSwitchTab={switchToTab}
+                    onCloseTab={closeTab}
+                  />
+                ) : (
+                  <span className="text-sm font-medium text-muted-foreground flex-1 min-w-0 truncate">
+                    {headerTitle}
+                  </span>
+                )}
                 {selectedPath && (
                   <div className="flex items-center gap-1 text-xs text-muted-foreground">
                     {isSaving ? (
@@ -2568,14 +2579,6 @@ function App() {
               ) : (
               <FileCardProvider onOpenKnowledgeFile={(path) => { navigateToFile(path) }}>
               <div className="flex min-h-0 flex-1 flex-col">
-                <ChatTabBar
-                  tabs={openTabs}
-                  activeTabId={activeTabId}
-                  getTabTitle={getTabTitle}
-                  processingRunIds={processingRunIds}
-                  onSwitchTab={switchToTab}
-                  onCloseTab={closeTab}
-                />
                 <Conversation className="relative flex-1 overflow-y-auto [scrollbar-gutter:stable]">
                   <ScrollPositionPreserver />
                   <ConversationContent className={conversationContentClassName}>
diff --git a/apps/x/apps/renderer/src/components/chat-tab-bar.tsx b/apps/x/apps/renderer/src/components/chat-tab-bar.tsx
index ad29bfb6..0c150207 100644
--- a/apps/x/apps/renderer/src/components/chat-tab-bar.tsx
+++ b/apps/x/apps/renderer/src/components/chat-tab-bar.tsx
@@ -24,10 +24,8 @@ export function ChatTabBar({
   onSwitchTab,
   onCloseTab,
 }: ChatTabBarProps) {
-  if (tabs.length <= 1) return null
-
   return (
-    <div className="flex items-center gap-0 border-b border-border bg-sidebar overflow-x-auto px-1 shrink-0">
+    <div className="titlebar-no-drag flex flex-1 items-center gap-0 overflow-x-auto min-w-0">
       {tabs.map((tab) => {
         const isActive = tab.id === activeTabId
         const isProcessing = tab.runId ? processingRunIds.has(tab.runId) : false
@@ -39,7 +37,7 @@ export function ChatTabBar({
             type="button"
             onClick={() => onSwitchTab(tab.id)}
             className={cn(
-              "group/tab relative flex items-center gap-1.5 px-3 py-1.5 text-xs max-w-[180px] min-w-[80px] transition-colors",
+              "group/tab relative flex items-center gap-1.5 px-3 h-full text-xs max-w-[180px] min-w-[80px] transition-colors",
               isActive
                 ? "bg-accent text-accent-foreground"
                 : "text-muted-foreground hover:bg-accent/50 hover:text-foreground"