diff --git a/frontend/components/chat/ChatWindow.jsx b/frontend/components/chat/ChatWindow.jsx
index 8406521..00a0355 100644
--- a/frontend/components/chat/ChatWindow.jsx
+++ b/frontend/components/chat/ChatWindow.jsx
@@ -137,6 +137,13 @@ export default function ChatWindow({ selectedUser, onBack, isMobileHidden }) {
             getMessages(selectedUser._id)
             subscribeToMessages()
         }
+
+useEffect(() => {
+    if (selectedUser && textareaRef.current) {
+        textareaRef.current.focus();
+    }
+}, [selectedUser]);
+
         return () => unsubscribeFromMessages()
     }, [selectedUser, getMessages, subscribeToMessages, unsubscribeFromMessages])