diff --git a/apps/web/src/pages/terminal.tsx b/apps/web/src/pages/terminal.tsx
index 4efa750..1d4f03a 100644
--- a/apps/web/src/pages/terminal.tsx
+++ b/apps/web/src/pages/terminal.tsx
@@ -162,17 +162,21 @@ export const TerminalPage: React.FC = () => {
 		setActiveSessionId,
 	]);
 
-	// Exit fullscreen on Escape
-	useEffect(() => {
-		if (!isFullscreen) return;
-		const handleEscape = (e: KeyboardEvent) => {
-			if (e.key === "Escape") {
-				setIsFullscreen(false);
+	// Click outside terminal content/header to exit fullscreen
+	const handleFullscreenClick = useCallback(
+		(e: React.MouseEvent<HTMLElement>) => {
+			if (!isFullscreen) return;
+			const target = e.target as Node;
+			const current = e.currentTarget as HTMLElement;
+			const content = current.querySelector(".terminal-page-content");
+			const header = current.querySelector(".terminal-fullscreen-header");
+			if (content?.contains(target) || header?.contains(target)) {
+				return;
 			}
-		};
-		window.addEventListener("keydown", handleEscape);
-		return () => window.removeEventListener("keydown", handleEscape);
-	}, [isFullscreen]);
+			setIsFullscreen(false);
+		},
+		[isFullscreen],
+	);
 
 	const handleSelect = useCallback(
 		(sessionId: string) => {
@@ -302,7 +306,10 @@ export const TerminalPage: React.FC = () => {
 	}
 
 	return (
-		<section className={`terminal-page ${isFullscreen ? "fullscreen" : ""}`}>
+		<section
+			className={`terminal-page ${isFullscreen ? "fullscreen" : ""}`}
+			onClick={handleFullscreenClick}
+		>
 			{!isFullscreen && (
 				<div className="terminal-page-header">
 					<button
diff --git a/apps/web/src/styles.css b/apps/web/src/styles.css
index 0bfc895..d6add42 100644
--- a/apps/web/src/styles.css
+++ b/apps/web/src/styles.css
@@ -2887,8 +2887,8 @@ a.nav-item,
 	right: 0;
 	bottom: 0;
 	z-index: 1000;
-	padding: 0;
-	gap: 0;
+	padding: 8px;
+	gap: 8px;
 	background: #1e1e1e;
 }