diff --git a/frontend/src/components/Chat.tsx b/frontend/src/components/Chat.tsx
index 1368ec9..8b9e605 100644
--- a/frontend/src/components/Chat.tsx
+++ b/frontend/src/components/Chat.tsx
@@ -390,7 +390,11 @@ export function Chat({ projectPath, onCloseProject }: ChatProps) {
 		const element = scrollContainerRef.current;
 		if (element) {
 			element.scrollTop = element.scrollHeight;
-			lastScrollTopRef.current = element.scrollHeight;
+			// Read scrollTop back after assignment: the browser caps it at
+			// (scrollHeight - clientHeight), so storing scrollHeight would
+			// make handleScroll incorrectly interpret the next scroll event
+			// as an upward scroll and disable auto-scrolling.
+			lastScrollTopRef.current = element.scrollTop;
 		}
 	}, []);