diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
index 2ee588985..7275baed9 100644
--- a/src/lib/components/chat/Chat.svelte
+++ b/src/lib/components/chat/Chat.svelte
@@ -1744,6 +1744,11 @@
 		history.currentId = userMessageId;
 
 		await tick();
+
+		if (autoScroll) {
+			scrollToBottom();
+		}
+
 		await sendPrompt(history, userPrompt, userMessageId);
 	};
 
@@ -1754,6 +1759,10 @@
 			let userMessage = history.messages[message.parentId];
 			let userPrompt = userMessage.content;
 
+			if (autoScroll) {
+				scrollToBottom();
+			}
+
 			if ((userMessage?.models ?? [...selectedModels]).length == 1) {
 				// If user message has only one model selected, sendPrompt automatically selects it for regeneration
 				await sendPrompt(history, userPrompt, userMessage.id);