diff --git a/ui/suite/partials/chat.html b/ui/suite/partials/chat.html
index e5b5599..94ea736 100644
--- a/ui/suite/partials/chat.html
+++ b/ui/suite/partials/chat.html
@@ -994,6 +994,7 @@ function addMessage(sender, content, msgId) {
           if (isTagBalanced(cleanContent) || (Date.now() - lastRenderTime > 2000)) {
             msgContent.innerHTML = renderMentionInMessage(cleanContent);
             lastRenderTime = Date.now();
+            if (!isUserScrolling) scrollToBottom(true);
           }
         } else {
           // Standard markdown/text rendering
@@ -1002,6 +1003,7 @@ function addMessage(sender, content, msgId) {
             : escapeHtml(cleanContent);
           parsed = renderMentionInMessage(parsed);
           msgContent.innerHTML = parsed;
+          if (!isUserScrolling) scrollToBottom(true);
         }
       }
 
@@ -1019,6 +1021,7 @@ function addMessage(sender, content, msgId) {
           el.querySelector(".message-content").innerHTML = parsed;
           el.removeAttribute("id");
           setupMentionClickHandlers(el);
+          if (!isUserScrolling) scrollToBottom(true);
         }
         streamingMessageId = null;
         currentStreamingContent = "";