diff --git a/app/components/chat.tsx b/app/components/chat.tsx
index f1ea597d..3864a329 100644
--- a/app/components/chat.tsx
+++ b/app/components/chat.tsx
@@ -286,7 +286,6 @@ function useScrollToBottom() {
     const dom = scrollRef.current;
     if (dom && autoScroll) {
       setTimeout(() => (dom.scrollTop = dom.scrollHeight), 1);
-      setAutoScroll(false);
     }
   });
 
@@ -460,6 +459,11 @@ export function Chat(props: {
 
   const [showPromptModal, setShowPromptModal] = useState(false);
 
+  // Auto focus
+  useEffect(() => {
+    inputRef.current?.focus();
+  }, []);
+
   return (
     <div className={styles.chat} key={session.id}>
       <div className={styles["window-header"]}>