diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
index 7868564dc6..d4418a1d0e 100644
--- a/src/lib/components/chat/Chat.svelte
+++ b/src/lib/components/chat/Chat.svelte
@@ -431,7 +431,7 @@
 					// Auto-scroll to the embed once it's rendered in the DOM
 					await tick();
 					setTimeout(() => {
-						const embedEl = document.getElementById(`${event.message_id}-embeds-0`);
+						const embedEl = document.getElementById(`${event.message_id}-embeds-container`);
 						if (embedEl) {
 							embedEl.scrollIntoView({ behavior: 'smooth', block: 'center' });
 						}
diff --git a/src/lib/components/chat/Messages/ResponseMessage.svelte b/src/lib/components/chat/Messages/ResponseMessage.svelte
index ae55ca3495..fa0b967e00 100644
--- a/src/lib/components/chat/Messages/ResponseMessage.svelte
+++ b/src/lib/components/chat/Messages/ResponseMessage.svelte
@@ -679,7 +679,10 @@
 						{/if}
 
 						{#if message?.embeds && message.embeds.length > 0}
-							<div class="my-1 w-full flex overflow-x-auto gap-2 flex-wrap">
+							<div
+								class="my-1 w-full flex overflow-x-auto gap-2 flex-wrap"
+								id={`${message.id}-embeds-container`}
+							>
 								{#each message.embeds as embed, idx}
 									<div class="my-2 w-full" id={`${message.id}-embeds-${idx}`}>
 										<FullHeightIframe