diff --git a/src/lib/components/chat/Messages/Markdown/ConsecutiveDetailsGroup.svelte b/src/lib/components/chat/Messages/Markdown/ConsecutiveDetailsGroup.svelte
index 5dbba1abd7..a18a6db683 100644
--- a/src/lib/components/chat/Messages/Markdown/ConsecutiveDetailsGroup.svelte
+++ b/src/lib/components/chat/Messages/Markdown/ConsecutiveDetailsGroup.svelte
@@ -107,22 +107,6 @@
 </script>
 
 <div {id} class="w-full">
-	{#if allEmbeds.length > 0}
-		<!-- Embeds rendered directly above the collapsed group -->
-		{#each allEmbeds as embedItem, idx}
-			<div id={`${id}-embed-${idx}`}>
-				<FullHeightIframe
-					src={embedItem.embed}
-					args={embedItem.args}
-					allowScripts={true}
-					allowForms={$settings?.iframeSandboxAllowForms ?? false}
-					allowSameOrigin={$settings?.iframeSandboxAllowSameOrigin ?? false}
-					allowPopups={true}
-				/>
-			</div>
-		{/each}
-	{/if}
-
 	<!-- svelte-ignore a11y-no-static-element-interactions -->
 	<button
 		class="w-fit text-left text-gray-500 hover:text-gray-700 dark:hover:text-gray-300 transition cursor-pointer"
@@ -176,4 +160,19 @@
 			</div>
 		</div>
 	{/if}
+
+	{#if allEmbeds.length > 0}
+		{#each allEmbeds as embedItem, idx}
+			<div id={`${id}-embed-${idx}`}>
+				<FullHeightIframe
+					src={embedItem.embed}
+					args={embedItem.args}
+					allowScripts={true}
+					allowForms={$settings?.iframeSandboxAllowForms ?? false}
+					allowSameOrigin={$settings?.iframeSandboxAllowSameOrigin ?? false}
+					allowPopups={true}
+				/>
+			</div>
+		{/each}
+	{/if}
 </div>
diff --git a/src/lib/components/chat/Messages/Markdown/MarkdownTokens.svelte b/src/lib/components/chat/Messages/Markdown/MarkdownTokens.svelte
index a2bf7df8a1..0bd15fc2e5 100644
--- a/src/lib/components/chat/Messages/Markdown/MarkdownTokens.svelte
+++ b/src/lib/components/chat/Messages/Markdown/MarkdownTokens.svelte
@@ -380,6 +380,7 @@
 						<ToolCallDisplay
 							id={`${id}-${tokenIdx}-${detailIdx}-tc`}
 							attributes={detailToken.attributes}
+							grouped={true}
 							open={false}
 							className="w-full space-y-1"
 						/>
diff --git a/src/lib/components/common/ToolCallDisplay.svelte b/src/lib/components/common/ToolCallDisplay.svelte
index 2d9a3eb813..e1c5a3bfb4 100644
--- a/src/lib/components/common/ToolCallDisplay.svelte
+++ b/src/lib/components/common/ToolCallDisplay.svelte
@@ -31,6 +31,7 @@
 	} = {};
 
 	export let open = false;
+	export let grouped = false;
 	export let className = '';
 
 	const RESULT_PREVIEW_LIMIT = 10000;
@@ -87,7 +88,7 @@
 </script>
 
 <div {id} class={className}>
-	{#if embeds && Array.isArray(embeds) && embeds.length > 0}
+	{#if !grouped && embeds && Array.isArray(embeds) && embeds.length > 0}
 		<!-- Embed Mode: Show iframes without collapsible behavior -->
 		<div class="py-1 w-full cursor-pointer">
 			<div class="w-full text-xs text-gray-500">