diff --git a/src/main/main.ts b/src/main/main.ts
index a52a337..e326b9e 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -48,6 +48,7 @@ function createWindow(): void {
     minHeight: 600,
     title: 'Blogging Desktop Server',
     backgroundColor: '#1e1e1e', // VS Code dark background
+    titleBarStyle: process.platform === 'darwin' ? 'hiddenInset' : 'default',
     webPreferences: {
       preload: path.join(__dirname, 'preload.js'),
       nodeIntegration: false,
diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index a368d24..b54c315 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect } from 'react';
-import { ActivityBar, Sidebar, Editor, StatusBar, Panel, TabBar, ToastContainer, showToast, ResizablePanel } from './components';
+import { ActivityBar, Sidebar, Editor, StatusBar, Panel, TabBar, ToastContainer, showToast, ResizablePanel, WindowTitleBar } from './components';
 import { useAppStore, PostData, MediaData, TaskProgress } from './store';
 import { loadTabsForProject, saveTabsForProject } from './utils';
 import './App.css';
@@ -315,6 +315,7 @@ const App: React.FC = () => {
 
   return (
     <div className="app">
+      <WindowTitleBar />
       <div className="app-main">
         <ActivityBar />
         {sidebarVisible && (
diff --git a/src/renderer/components/TabBar/TabBar.css b/src/renderer/components/TabBar/TabBar.css
index b2f14ac..b0ed5e5 100644
--- a/src/renderer/components/TabBar/TabBar.css
+++ b/src/renderer/components/TabBar/TabBar.css
@@ -45,29 +45,6 @@
   background-color: var(--vscode-toolbar-hoverBackground, rgba(90, 93, 94, 0.31));
 }
 
-/* Sidebar toggle button */
-.tab-bar-toggle-sidebar {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 35px;
-  height: 100%;
-  background-color: transparent;
-  border: none;
-  border-right: 1px solid var(--vscode-tab-border, #252526);
-  color: var(--vscode-icon-foreground, #c5c5c5);
-  cursor: pointer;
-  flex-shrink: 0;
-}
-
-.tab-bar-toggle-sidebar:hover {
-  background-color: var(--vscode-toolbar-hoverBackground, rgba(90, 93, 94, 0.31));
-}
-
-.tab-bar-toggle-sidebar:active {
-  background-color: var(--vscode-toolbar-activeBackground, rgba(99, 102, 103, 0.31));
-}
-
 .tab-scroll-left {
   border-right: 1px solid var(--vscode-tab-border, #252526);
 }
diff --git a/src/renderer/components/TabBar/TabBar.tsx b/src/renderer/components/TabBar/TabBar.tsx
index 754e16d..e1663af 100644
--- a/src/renderer/components/TabBar/TabBar.tsx
+++ b/src/renderer/components/TabBar/TabBar.tsx
@@ -161,7 +161,6 @@ export const TabBar: React.FC = () => {
     media,
     activeProject,
     dirtyPosts,
-    sidebarVisible,
     toggleSidebar,
     setActiveTab, 
     closeTab,
@@ -475,18 +474,6 @@ export const TabBar: React.FC = () => {
 
   return (
     <div className="tab-bar">
-      <button
-        className="tab-bar-toggle-sidebar"
-        onClick={toggleSidebar}
-        title={`${sidebarVisible ? 'Hide' : 'Show'} Sidebar (Ctrl+B)`}
-      >
-        <svg width="16" height="16" viewBox="0 0 16 16" fill="currentColor">
-          <path d="M0 1h16v14H0V1zm1 1v12h4V2H1zm5 0v12h9V2H6z"/>
-          {!sidebarVisible && <path d="M2 4h2v1H2V4zm0 2h2v1H2V6zm0 2h2v1H2V8z" opacity="0.5"/>}
-          {sidebarVisible && <path d="M2 4h2v1H2V4zm0 2h2v1H2V6zm0 2h2v1H2V8z"/>}
-        </svg>
-      </button>
-      
       {showLeftArrow && (
         <button 
           className="tab-scroll-button tab-scroll-left"
diff --git a/src/renderer/components/WindowTitleBar/WindowTitleBar.css b/src/renderer/components/WindowTitleBar/WindowTitleBar.css
new file mode 100644
index 0000000..5744ba4
--- /dev/null
+++ b/src/renderer/components/WindowTitleBar/WindowTitleBar.css
@@ -0,0 +1,48 @@
+.window-titlebar {
+  height: 34px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background-color: var(--vscode-editorGroupHeader-tabsBackground, #252526);
+  border-bottom: 1px solid var(--vscode-editorGroupHeader-tabsBorder, #1e1e1e);
+  flex-shrink: 0;
+  -webkit-app-region: drag;
+}
+
+.window-titlebar-drag-region {
+  flex: 1;
+  height: 100%;
+}
+
+.window-titlebar-actions {
+  height: 100%;
+  display: flex;
+  align-items: center;
+  margin-right: 8px;
+}
+
+.window-titlebar-action-button {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  background: transparent;
+  border: none;
+  color: var(--vscode-titleBar-activeForeground, var(--vscode-icon-foreground, #c5c5c5));
+  cursor: pointer;
+  border-radius: 4px;
+  -webkit-app-region: no-drag;
+}
+
+.window-titlebar-action-button svg {
+  display: block;
+}
+
+.window-titlebar-action-button:hover {
+  background-color: var(--vscode-toolbar-hoverBackground, rgba(90, 93, 94, 0.31));
+}
+
+.window-titlebar-action-button:active {
+  background-color: var(--vscode-toolbar-activeBackground, rgba(99, 102, 103, 0.31));
+}
\ No newline at end of file
diff --git a/src/renderer/components/WindowTitleBar/WindowTitleBar.tsx b/src/renderer/components/WindowTitleBar/WindowTitleBar.tsx
new file mode 100644
index 0000000..4dc1781
--- /dev/null
+++ b/src/renderer/components/WindowTitleBar/WindowTitleBar.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { useAppStore } from '../../store';
+import './WindowTitleBar.css';
+
+export const WindowTitleBar: React.FC = () => {
+  const { sidebarVisible, toggleSidebar } = useAppStore();
+
+  return (
+    <div className="window-titlebar" data-testid="window-titlebar">
+      <div className="window-titlebar-drag-region" />
+      <div className="window-titlebar-actions">
+        <button
+          className="window-titlebar-action-button"
+          aria-label="Toggle Sidebar"
+          onClick={toggleSidebar}
+          title={`${sidebarVisible ? 'Hide' : 'Show'} Sidebar (Ctrl+B)`}
+        >
+          <svg width="16" height="16" viewBox="0 0 16 16" aria-hidden="true">
+            <path
+              d="M3 3.75A1.75 1.75 0 0 1 4.75 2h6.5A1.75 1.75 0 0 1 13 3.75v8.5A1.75 1.75 0 0 1 11.25 14h-6.5A1.75 1.75 0 0 1 3 12.25v-8.5z"
+              fill="none"
+              stroke="currentColor"
+              strokeWidth="1"
+            />
+            <path d="M4.5 3.5h3.75v9H4.5z" fill="currentColor"/>
+          </svg>
+        </button>
+      </div>
+    </div>
+  );
+};
+
+export default WindowTitleBar;
\ No newline at end of file
diff --git a/src/renderer/components/WindowTitleBar/index.ts b/src/renderer/components/WindowTitleBar/index.ts
new file mode 100644
index 0000000..0576a0b
--- /dev/null
+++ b/src/renderer/components/WindowTitleBar/index.ts
@@ -0,0 +1 @@
+export { WindowTitleBar } from './WindowTitleBar';
diff --git a/src/renderer/components/index.ts b/src/renderer/components/index.ts
index aa982f3..0a3ea90 100644
--- a/src/renderer/components/index.ts
+++ b/src/renderer/components/index.ts
@@ -22,3 +22,4 @@ export { AISuggestionsModal, type AISuggestions, type CurrentValues } from './AI
 export { ChatPanel } from './ChatPanel';
 export { ImportAnalysisView } from './ImportAnalysisView';
 export { InsertModal } from './InsertModal';
+export { WindowTitleBar } from './WindowTitleBar';
diff --git a/tests/renderer/components/WindowTitleBar.test.tsx b/tests/renderer/components/WindowTitleBar.test.tsx
new file mode 100644
index 0000000..242d5b3
--- /dev/null
+++ b/tests/renderer/components/WindowTitleBar.test.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { describe, it, expect, beforeEach } from 'vitest';
+import { fireEvent, render, screen } from '@testing-library/react';
+import { WindowTitleBar } from '../../../src/renderer/components/WindowTitleBar/WindowTitleBar';
+import { useAppStore } from '../../../src/renderer/store';
+
+describe('WindowTitleBar', () => {
+  beforeEach(() => {
+    useAppStore.setState({
+      sidebarVisible: true,
+    });
+  });
+
+  it('renders a right-side sidebar toggle button and toggles store state', () => {
+    render(<WindowTitleBar />);
+
+    const toggleButton = screen.getByLabelText('Toggle Sidebar');
+    expect(toggleButton).toBeInTheDocument();
+    expect(toggleButton).toHaveAttribute('title', 'Hide Sidebar (Ctrl+B)');
+
+    fireEvent.click(toggleButton);
+
+    expect(useAppStore.getState().sidebarVisible).toBe(false);
+    expect(toggleButton).toHaveAttribute('title', 'Show Sidebar (Ctrl+B)');
+  });
+
+  it('uses a VS Code-like sidebar toggle icon shape', () => {
+    render(<WindowTitleBar />);
+
+    const toggleButton = screen.getByLabelText('Toggle Sidebar');
+    const svg = toggleButton.querySelector('svg');
+    const paths = svg?.querySelectorAll('path');
+
+    expect(svg).not.toBeNull();
+    expect(paths?.[0]?.getAttribute('d')).toBe('M3 3.75A1.75 1.75 0 0 1 4.75 2h6.5A1.75 1.75 0 0 1 13 3.75v8.5A1.75 1.75 0 0 1 11.25 14h-6.5A1.75 1.75 0 0 1 3 12.25v-8.5z');
+    expect(paths?.[1]?.getAttribute('d')).toBe('M4.5 3.5h3.75v9H4.5z');
+  });
+});