diff --git a/web-common/src/features/chat/core/messages/Messages.svelte b/web-common/src/features/chat/core/messages/Messages.svelte
index d8f711b9c43..02d76fc282a 100644
--- a/web-common/src/features/chat/core/messages/Messages.svelte
+++ b/web-common/src/features/chat/core/messages/Messages.svelte
@@ -46,8 +46,10 @@
   $: isConversationEmpty =
     ($getConversationQuery.data?.messages?.length ?? 0) === 0;
 
-  // Track previous block count to detect new content
+  // Track previous block count to detect new content and previous block type to detect block changing.
+  // This is used to determine whether to scroll to bottom of messages container or not.
   let previousBlockCount = 0;
+  let previousBlockType = "";
 
   // Check if user is near the bottom of a scroll container
   function isNearBottom(element: Element, threshold = 100): boolean {
@@ -60,20 +62,24 @@
   }
 
   // Auto-scroll behavior:
-  // - Always scroll when new blocks are added (new message sent or response started)
+  // - Always scroll when new blocks are added or if the last block changes (new message sent or response started)
   // - Only scroll during streaming if user is near the bottom (respect scroll position)
   afterUpdate(() => {
     const currentBlockCount = blocks.length;
-    const hasNewBlocks = currentBlockCount > previousBlockCount;
+    const currentBlockType = blocks[currentBlockCount - 1]?.type ?? "";
+    const hasBlockChanged =
+      currentBlockCount > previousBlockCount ||
+      currentBlockType !== previousBlockType;
     previousBlockCount = currentBlockCount;
+    previousBlockType = currentBlockType;
 
     if (messagesContainer && layout === "sidebar") {
-      if (hasNewBlocks || isNearBottom(messagesContainer)) {
+      if (hasBlockChanged || isNearBottom(messagesContainer)) {
         scrollToBottom(messagesContainer);
       }
     } else if (layout === "fullpage") {
       const parentWrapper = messagesContainer.closest(".chat-messages-wrapper");
-      if (parentWrapper && (hasNewBlocks || isNearBottom(parentWrapper))) {
+      if (parentWrapper && (hasBlockChanged || isNearBottom(parentWrapper))) {
         scrollToBottom(parentWrapper);
       }
     }