diff --git a/frontend/js/chat.js b/frontend/js/chat.js
index b767637..cfdddb3 100644
--- a/frontend/js/chat.js
+++ b/frontend/js/chat.js
@@ -79,7 +79,7 @@ async function initializeSocket() {
             const item = document.createElement('li');
             item.textContent = `${username}: ${content}`;
             messages.appendChild(item);
-            window.scrollTo(0, document.body.scrollHeight);
+            messages.scrollTop = messages.scrollHeight;
         }
 
         // Add and display contact/incoming messages
@@ -136,6 +136,7 @@ async function initializeSocket() {
         if (input.value && currentRecipient) {
             console.log('Sending message:', input.value, 'to', currentRecipient);
             socket.emit('chat message', { content: input.value, recipient: currentRecipient });
+            messages.scrollTop = messages.scrollHeight;
             input.value = '';
         }
     });
@@ -149,7 +150,7 @@ async function initializeSocket() {
             item.textContent = `${message.username}: ${message.content}`;
             messages.appendChild(item);
         }
-        window.scrollTo(0, document.body.scrollHeight);
+        messages.scrollTop = messages.scrollHeight;
     });
 }