diff --git a/AgentCompany-New/src/renderer/src/shared/Shell.tsx b/AgentCompany-New/src/renderer/src/shared/Shell.tsx
index 2520af33..2fb134f9 100644
--- a/AgentCompany-New/src/renderer/src/shared/Shell.tsx
+++ b/AgentCompany-New/src/renderer/src/shared/Shell.tsx
@@ -73,8 +73,10 @@ export function Shell({
   const badges = computeBadges(snapshot, organization.id);
   const activeLabel = labelFor(route);
 
+  const isMac = window.agentCompany.platform === "darwin";
+
   return (
-    <div className="app-shell">
+    <div className={`app-shell ${isMac ? "is-mac" : ""}`.trim()}>
       <aside className="sidebar">
         <OrgSwitcher
           snapshot={snapshot}
@@ -128,11 +130,12 @@ export function Shell({
           <span className="crumb">{activeLabel}</span>
           <div className="topbar-actions">
             <span className="topbar-actions-slot" ref={setActionsSlot} />
-            {window.agentCompany.platform !== "darwin" && (
-              <>
+            {!isMac && (
+              <span className="window-controls">
                 <IconButton icon="minus" label="Minimize" onClick={() => void window.agentCompany.windowMinimize()} />
+                <IconButton icon="grid" label="Maximize" onClick={() => void window.agentCompany.windowMaximize()} />
                 <IconButton icon="x" label="Close" onClick={() => void window.agentCompany.windowClose()} />
-              </>
+              </span>
             )}
           </div>
         </header>
diff --git a/AgentCompany-New/src/renderer/src/styles.css b/AgentCompany-New/src/renderer/src/styles.css
index 54d776a5..1902470a 100644
--- a/AgentCompany-New/src/renderer/src/styles.css
+++ b/AgentCompany-New/src/renderer/src/styles.css
@@ -61,6 +61,8 @@ a { color: inherit; }
   border-right: 1px solid var(--border-soft);
   background: var(--bg);
 }
+/* Clear the native macOS traffic lights that overlap the sidebar top. */
+.app-shell.is-mac .sidebar { padding-top: 34px; }
 .sidebar-org {
   display: flex;
   align-items: center;
@@ -292,6 +294,7 @@ a { color: inherit; }
 .crumb-sep { color: var(--text-4); }
 .topbar-actions { margin-left: auto; display: flex; align-items: center; gap: 6px; }
 .topbar-actions-slot { display: flex; align-items: center; gap: 6px; }
+.window-controls { display: flex; align-items: center; gap: 2px; padding-left: 6px; }
 
 .content {
   flex: 1;