diff --git a/js/main.js b/js/main.js
index a8bbbc71..5f79c3ec 100644
--- a/js/main.js
+++ b/js/main.js
@@ -1075,15 +1075,13 @@ document.fonts.addEventListener("loadingdone", (event) => {
     const currentHeight = chatInputRow.offsetHeight;
     const heightDifference = currentHeight - originalHeight;
     chatParent.style.marginBottom = `${originalMarginBottom + heightDifference}px`;
+    if (!window.isScrolled) {
+      chatParent.scrollTop = chatParent.scrollHeight - chatParent.clientHeight;
+    }
   }
 
-  // Watch for changes that might affect height
-  const observer = new MutationObserver(updateMargin);
-  observer.observe(chatInputRow, {
-    childList: true,
-    subtree: true,
-    attributes: true
-  });
+  // Watch for size changes that affect height
+  new ResizeObserver(updateMargin).observe(chatInputRow);
 
   // Also listen for window resize
   window.addEventListener("resize", updateMargin);