diff --git a/apps/client/src/features/ai-chat/components/chat-input.tsx b/apps/client/src/features/ai-chat/components/chat-input.tsx
index 73a7f126..42649aa6 100644
--- a/apps/client/src/features/ai-chat/components/chat-input.tsx
+++ b/apps/client/src/features/ai-chat/components/chat-input.tsx
@@ -52,6 +52,10 @@ export default function ChatInput({
         minRows={1}
         maxRows={6}
         disabled={disabled}
+        // Focus the composer whenever this input mounts. ChatThread is remounted
+        // via `key` on every chat appearance (window open, "New chat", chat
+        // switch), so a fresh chat lands with the cursor ready in the field.
+        autoFocus
       />
       {isStreaming ? (
         <Tooltip label={t("Stop")} withArrow>