diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index b37397e9ff4f293d984b3f8818426bb16c37e644..38d95b89987a45538d0b0ab7828d59c8e99f4fa8 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -863,7 +863,11 @@ export default function ChatView() {
   if (!activeThread) {
     return (
       <div className="flex min-h-0 flex-1 flex-col bg-background text-muted-foreground/40">
-        {isElectron && <div className="drag-region h-[52px] shrink-0" />}
+        {isElectron && (
+          <div className="drag-region flex h-[52px] shrink-0 items-center border-b border-border px-5">
+            <span className="text-xs text-muted-foreground/50">No active thread</span>
+          </div>
+        )}
         <div className="flex flex-1 items-center justify-center">
           <div className="text-center">
             <p className="text-sm">Select a thread or create a new one to get started.</p>
@@ -877,7 +881,7 @@ export default function ChatView() {
     <div className="flex min-h-0 flex-1 flex-col bg-background">
       {/* Top bar */}
       <header
-        className={`flex items-center justify-between border-b border-border px-5 pb-3 ${isElectron ? "drag-region pt-[28px]" : "pt-3"}`}
+        className={`flex items-center justify-between border-b border-border px-5 ${isElectron ? "drag-region h-[52px]" : "py-3"}`}
       >
         <div className="flex items-center gap-3">
           <h2 className="text-sm font-medium text-foreground">{activeThread.title}</h2>
diff --git a/apps/web/src/components/DiffPanel.tsx b/apps/web/src/components/DiffPanel.tsx
index 72e11aa4a5849ae96aee651f78f0c90b2ffb525f..59ad7303c1655de66d88d91dc33f25c8754d4f56 100644
--- a/apps/web/src/components/DiffPanel.tsx
+++ b/apps/web/src/components/DiffPanel.tsx
@@ -8,7 +8,7 @@ export default function DiffPanel() {
     <aside className="flex h-full w-[400px] shrink-0 flex-col border-l border-border bg-card">
       {/* Header */}
       <div
-        className={`flex items-center justify-between border-b border-border px-4 pb-3 ${isElectron ? "drag-region pt-[28px]" : "pt-3"}`}
+        className={`flex items-center justify-between border-b border-border px-4 ${isElectron ? "drag-region h-[52px]" : "py-3"}`}
       >
         <h3 className="text-xs font-medium text-foreground">Uncommitted changes</h3>
         <button
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index c42d7de72acc86b65cc1a9ba0df31e360b508df9..4fec0637ead5f1e84899593f8e914cd385776745 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -237,10 +237,10 @@ export default function Sidebar() {
 
   return (
     <aside className="sidebar flex h-full w-[260px] shrink-0 flex-col border-r border-border bg-card">
-      {/* Drag region / traffic light space (Electron only) */}
-      {isElectron && <div className="drag-region h-[52px] shrink-0" />}
       {/* Branding */}
-      <div className={`flex items-center gap-2.5 px-4 pb-4 ${isElectron ? "" : "pt-4"}`}>
+      <div
+        className={`flex items-center gap-2.5 px-4 ${isElectron ? "drag-region h-[52px] pl-[76px]" : "py-4"}`}
+      >
         <span className="flex-1 text-sm font-semibold tracking-tight text-foreground">
           T3 <span className="font-normal text-muted-foreground">Code</span>
         </span>