diff --git a/packages/web/src/components/chat/MessageInput.tsx b/packages/web/src/components/chat/MessageInput.tsx
index 6ecd6c4c..7f20add9 100644
--- a/packages/web/src/components/chat/MessageInput.tsx
+++ b/packages/web/src/components/chat/MessageInput.tsx
@@ -87,9 +87,10 @@ export function MessageInput({ channelId, channelName }: MessageInputProps) {
       setContent('');
       setFiles([]);
 
-      // Reset textarea height
+      // Reset textarea height and re-focus
       if (textareaRef.current) {
         textareaRef.current.style.height = 'auto';
+        textareaRef.current.focus();
       }
 
       // Clear typing timeout