diff --git a/apps/x/apps/renderer/src/App.tsx b/apps/x/apps/renderer/src/App.tsx
index a9a88bf7..8a5548da 100644
--- a/apps/x/apps/renderer/src/App.tsx
+++ b/apps/x/apps/renderer/src/App.tsx
@@ -6,7 +6,7 @@ import type { LanguageModelUsage, ToolUIPart } from 'ai';
 import './App.css'
 import z from 'zod';
 import { Button } from './components/ui/button';
-import { CheckIcon, LoaderIcon, ArrowUp } from 'lucide-react';
+import { CheckIcon, LoaderIcon, ArrowUp, PanelRightIcon } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import { MarkdownEditor } from './components/markdown-editor';
 import { ChatInputBar } from './components/chat-button';
@@ -334,7 +334,7 @@ function App() {
   })
   const [graphStatus, setGraphStatus] = useState<'idle' | 'loading' | 'ready' | 'error'>('idle')
   const [graphError, setGraphError] = useState<string | null>(null)
-  const [isChatSidebarOpen, setIsChatSidebarOpen] = useState(false)
+  const [isChatSidebarOpen, setIsChatSidebarOpen] = useState(true)
 
   // Auto-save state
   const [isSaving, setIsSaving] = useState(false)
@@ -1120,15 +1120,15 @@ function App() {
               knowledgeActions={knowledgeActions}
             />
             <SidebarInset className="overflow-hidden! min-h-0">
-              {/* Header with sidebar trigger */}
+              {/* Header with sidebar triggers */}
               <header className="flex h-12 shrink-0 items-center gap-2 border-b border-border px-3 bg-background">
                 <SidebarTrigger className="-ml-1" />
                 <Separator orientation="vertical" className="h-4" />
-                <span className="text-sm font-medium text-muted-foreground">
+                <span className="text-sm font-medium text-muted-foreground flex-1">
                   {headerTitle}
                 </span>
                 {selectedPath && (
-                  <div className="flex items-center gap-1 text-xs text-muted-foreground ml-auto">
+                  <div className="flex items-center gap-1 text-xs text-muted-foreground">
                     {isSaving ? (
                       <>
                         <LoaderIcon className="h-3 w-3 animate-spin" />
@@ -1147,11 +1147,25 @@ function App() {
                     variant="ghost"
                     size="sm"
                     onClick={() => setIsGraphOpen(false)}
-                    className="ml-auto text-foreground"
+                    className="text-foreground"
                   >
                     Close Graph
                   </Button>
                 )}
+                {(selectedPath || isGraphOpen) && (
+                  <>
+                    <Separator orientation="vertical" className="h-4" />
+                    <Button
+                      variant="ghost"
+                      size="icon"
+                      onClick={() => setIsChatSidebarOpen(!isChatSidebarOpen)}
+                      className="size-7 -mr-1"
+                    >
+                      <PanelRightIcon />
+                      <span className="sr-only">Toggle Chat Sidebar</span>
+                    </Button>
+                  </>
+                )}
               </header>
 
               {isGraphOpen ? (
@@ -1243,10 +1257,10 @@ function App() {
             </SidebarInset>
 
             {/* Chat sidebar - shown when viewing files/graph */}
-            {isChatSidebarOpen && (selectedPath || isGraphOpen) && (
+            {(selectedPath || isGraphOpen) && (
               <ChatSidebar
                 defaultWidth={400}
-                onClose={() => setIsChatSidebarOpen(false)}
+                isOpen={isChatSidebarOpen}
                 onNewChat={handleNewChat}
                 conversation={conversation}
                 currentAssistantMessage={currentAssistantMessage}
@@ -1255,9 +1269,6 @@ function App() {
                 message={message}
                 onMessageChange={setMessage}
                 onSubmit={handlePromptSubmit}
-                contextUsage={contextUsage}
-                maxTokens={maxTokens}
-                usedTokens={usedTokens}
                 knowledgeFiles={knowledgeFiles}
                 recentFiles={recentWikiFiles}
                 visibleFiles={visibleKnowledgeFiles}
diff --git a/apps/x/apps/renderer/src/components/chat-sidebar.tsx b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
index b5801209..c11fbfe4 100644
--- a/apps/x/apps/renderer/src/components/chat-sidebar.tsx
+++ b/apps/x/apps/renderer/src/components/chat-sidebar.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { ArrowUp, PanelRightClose, Plus } from 'lucide-react'
-import type { LanguageModelUsage, ToolUIPart } from 'ai'
+import { ArrowUp, Plus } from 'lucide-react'
+import type { ToolUIPart } from 'ai'
 import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
 import {
@@ -103,7 +103,7 @@ const DEFAULT_WIDTH = 400
 
 interface ChatSidebarProps {
   defaultWidth?: number
-  onClose: () => void
+  isOpen?: boolean
   onNewChat: () => void
   conversation: ConversationItem[]
   currentAssistantMessage: string
@@ -112,9 +112,6 @@ interface ChatSidebarProps {
   message: string
   onMessageChange: (message: string) => void
   onSubmit: (message: PromptInputMessage, mentions?: FileMention[]) => void
-  contextUsage: LanguageModelUsage
-  maxTokens: number
-  usedTokens: number
   knowledgeFiles?: string[]
   recentFiles?: string[]
   visibleFiles?: string[]
@@ -123,7 +120,7 @@ interface ChatSidebarProps {
 
 export function ChatSidebar({
   defaultWidth = DEFAULT_WIDTH,
-  onClose,
+  isOpen = true,
   onNewChat,
   conversation,
   currentAssistantMessage,
@@ -396,10 +393,15 @@ export function ChatSidebar({
     return null
   }
 
+  const displayWidth = isOpen ? width : 0
+
   return (
     <div
-      className="relative flex flex-col border-l border-border bg-background shrink-0"
-      style={{ width }}
+      className={cn(
+        "relative flex flex-col border-l border-border bg-background shrink-0 overflow-hidden",
+        !isResizing && "transition-[width] duration-200 ease-linear"
+      )}
+      style={{ width: displayWidth }}
     >
       {/* Resize handle */}
       <div
@@ -412,16 +414,8 @@ export function ChatSidebar({
         )}
       />
 
-      {/* Header - minimal, no border */}
-      <header className="flex h-12 shrink-0 items-center justify-between px-2">
-        <Tooltip>
-          <TooltipTrigger asChild>
-            <Button variant="ghost" size="icon" onClick={onClose} className="h-8 w-8 text-muted-foreground hover:text-foreground">
-              <PanelRightClose className="h-4 w-4" />
-            </Button>
-          </TooltipTrigger>
-          <TooltipContent side="bottom">Close</TooltipContent>
-        </Tooltip>
+      {/* Header - minimal, just new chat button */}
+      <header className="flex h-12 shrink-0 items-center justify-end px-2">
         <Tooltip>
           <TooltipTrigger asChild>
             <Button variant="ghost" size="icon" onClick={onNewChat} className="h-8 w-8 text-muted-foreground hover:text-foreground">