diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index 8274c78eb045edb553838e30413a0e85035058bb..a052a3db2a961dab038b0aeff51558f91151e84a 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -628,7 +628,7 @@ export default function ChatView() {
   // Empty state: no active thread
   if (!activeThread) {
     return (
-      <div className="flex flex-1 flex-col bg-background text-muted-foreground/40">
+      <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" />}
         <div className="flex flex-1 items-center justify-center">
           <div className="text-center">
@@ -640,7 +640,7 @@ export default function ChatView() {
   }
 
   return (
-    <div className="flex flex-1 flex-col bg-background">
+    <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"}`}
@@ -787,7 +787,7 @@ export default function ChatView() {
       )}
 
       {/* Messages */}
-      <div className="flex-1 overflow-y-auto px-5 py-4">
+      <div className="min-h-0 flex-1 overflow-y-auto px-5 py-4">
         {activeThread.messages.length === 0 && !isWorking ? (
           <div className="flex h-full items-center justify-center">
             <p className="text-sm text-muted-foreground/30">
diff --git a/apps/web/src/components/ThreadTerminalDrawer.tsx b/apps/web/src/components/ThreadTerminalDrawer.tsx
index b157ddced20c3982fefd4de2ee5a33f9aee3a2da..fedebfb6ab68e6bd167669ab8ce09af0ce227412 100644
--- a/apps/web/src/components/ThreadTerminalDrawer.tsx
+++ b/apps/web/src/components/ThreadTerminalDrawer.tsx
@@ -129,6 +129,7 @@ export default function ThreadTerminalDrawer({
     startY: number;
     startHeight: number;
   } | null>(null);
+  const didResizeDuringDragRef = useRef(false);
 
   useEffect(() => {
     onHeightChangeRef.current = onHeightChange;
@@ -152,11 +153,17 @@ export default function ThreadTerminalDrawer({
     [],
   );
 
-  const fitAndResizeTerminal = useCallback(() => {
+  const fitAndResizeTerminal = useCallback((preserveBottom = false) => {
     const activeTerminal = terminalRef.current;
     const activeFitAddon = fitAddonRef.current;
     if (!activeTerminal || !activeFitAddon) return;
+    const wasAtBottom =
+      preserveBottom &&
+      activeTerminal.buffer.active.viewportY >= activeTerminal.buffer.active.baseY;
     activeFitAddon.fit();
+    if (wasAtBottom) {
+      activeTerminal.scrollToBottom();
+    }
     void api.terminal
       .resize({
         threadId,
@@ -177,13 +184,14 @@ export default function ThreadTerminalDrawer({
       if (event.button !== 0) return;
       event.preventDefault();
       event.currentTarget.setPointerCapture(event.pointerId);
+      didResizeDuringDragRef.current = false;
       resizeStateRef.current = {
         pointerId: event.pointerId,
         startY: event.clientY,
-        startHeight: drawerHeight,
+        startHeight: drawerHeightRef.current,
       };
     },
-    [drawerHeight],
+    [],
   );
 
   const handleResizePointerMove = useCallback(
@@ -194,6 +202,11 @@ export default function ThreadTerminalDrawer({
       const clampedHeight = clampDrawerHeight(
         resizeState.startHeight + (resizeState.startY - event.clientY),
       );
+      if (clampedHeight === drawerHeightRef.current) {
+        return;
+      }
+      didResizeDuringDragRef.current = true;
+      drawerHeightRef.current = clampedHeight;
       setDrawerHeight(clampedHeight);
     },
     [],
@@ -207,9 +220,13 @@ export default function ThreadTerminalDrawer({
       if (event.currentTarget.hasPointerCapture(event.pointerId)) {
         event.currentTarget.releasePointerCapture(event.pointerId);
       }
+      if (!didResizeDuringDragRef.current) {
+        return;
+      }
       syncHeight(drawerHeightRef.current);
+      fitAndResizeTerminal(true);
     },
-    [syncHeight],
+    [fitAndResizeTerminal, syncHeight],
   );
 
   useEffect(() => {
@@ -219,7 +236,7 @@ export default function ThreadTerminalDrawer({
       if (changed) {
         setDrawerHeight(clampedHeight);
       } else {
-        fitAndResizeTerminal();
+        fitAndResizeTerminal(true);
       }
       if (!resizeStateRef.current) {
         syncHeight(clampedHeight);
@@ -366,7 +383,9 @@ export default function ThreadTerminalDrawer({
       }
     });
 
-    const fitTimer = window.setTimeout(fitAndResizeTerminal, 30);
+    const fitTimer = window.setTimeout(() => {
+      fitAndResizeTerminal(true);
+    }, 30);
     void openTerminal();
 
     return () => {
@@ -396,8 +415,12 @@ export default function ThreadTerminalDrawer({
     const terminal = terminalRef.current;
     const fitAddon = fitAddonRef.current;
     if (!terminal || !fitAddon) return;
+    const wasAtBottom = terminal.buffer.active.viewportY >= terminal.buffer.active.baseY;
     const frame = window.requestAnimationFrame(() => {
       fitAddon.fit();
+      if (wasAtBottom) {
+        terminal.scrollToBottom();
+      }
       void api.terminal
         .resize({
           threadId,