diff --git a/app/templates/base.html b/app/templates/base.html
index adca841..bc95816 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -64,9 +64,12 @@
          :class="{ hover: wsHeaderHover || workspaceMenuOpen }">
       <div class="workspace-info">
         <div class="workspace-avatar">{{ workspaceInitial }}</div>
-        <span class="workspace-name">{{ workspaceName }}</span>
+        <span class="workspace-name">{{ user.full_name or user.login or workspaceName }}</span>
       </div>
       <span class="workspace-chevron" :class="{ open: workspaceMenuOpen }">▾</span>
+      <button class="sidebar-collapse-inline" @click.stop="sidebarCollapsed = !sidebarCollapsed" title="Collapse sidebar">
+        <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="11 17 6 12 11 7"/><polyline points="18 17 13 12 18 7"/></svg>
+      </button>
     </div>
     <!-- User menu dropdown -->
     <div class="user-menu-dropdown" x-show="workspaceMenuOpen" @click.outside="workspaceMenuOpen=false" x-transition>
@@ -96,12 +99,12 @@
       <button class="nav-icon-btn" title="Inbox">
         <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="22 12 16 12 14 15 10 15 8 12 2 12"/><path d="M5.45 5.11L2 12v6a2 2 0 002 2h16a2 2 0 002-2v-6l-3.45-6.89A2 2 0 0016.76 4H7.24a2 2 0 00-1.79 1.11z"/></svg>
       </button>
-      <button class="nav-icon-btn" @click="openQuickFind" title="Search">
-        <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg>
-      </button>
       <button class="nav-icon-btn collapse-btn" @click="sidebarCollapsed = !sidebarCollapsed" title="Collapse sidebar">
         <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polyline points="11 17 6 12 11 7"/><polyline points="18 17 13 12 18 7"/></svg>
       </button>
+      <button class="nav-icon-btn" @click="openQuickFind" title="Search">
+        <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg>
+      </button>
     </div>
 
     <!-- Workspace -->
diff --git a/static/css/app.css b/static/css/app.css
index 1d70614..c90cec6 100644
--- a/static/css/app.css
+++ b/static/css/app.css
@@ -144,6 +144,21 @@ input, select, textarea { font-family: inherit; color: inherit; }
 .sidebar-workspace-header.hover {
   background: var(--bg-hover);
 }
+.sidebar-collapse-inline {
+  width: 22px; height: 22px;
+  display: flex; align-items: center; justify-content: center;
+  background: none; border: none; border-radius: 4px;
+  color: var(--text-dim); cursor: pointer; flex-shrink: 0;
+  opacity: 0; transition: opacity 150ms;
+}
+.sidebar-workspace-header:hover .sidebar-collapse-inline,
+.sidebar-workspace-header.hover .sidebar-collapse-inline {
+  opacity: 1;
+}
+.sidebar-collapse-inline:hover {
+  background: var(--bg-active);
+  color: var(--text);
+}
 .sidebar-workspace {
   /* keep for backward compat */
   display: flex;