diff --git a/src/lib/components/chat/ChatMessage.svelte b/src/lib/components/chat/ChatMessage.svelte
index fe9607c29f3..a0895a92952 100644
--- a/src/lib/components/chat/ChatMessage.svelte
+++ b/src/lib/components/chat/ChatMessage.svelte
@@ -444,17 +444,19 @@
{:else if unit.kind === "group"}
- {#if unit.blocks.length > 1}
-
+ {#if unit.blocks.length > 1 && unit.toolCount !== 1}
+
{:else}
-
- {@const only = unit.blocks[0]}
- {#if only.type === "think"}
-
- {:else}
-
- {/if}
+
+ {#each unit.blocks as block, blockIndex (block.type === "tool" ? `tool-${block.uuid}-${blockIndex}` : `think-${blockIndex}`)}
+ {#if block.type === "think"}
+
+ {:else}
+
+ {/if}
+ {/each}
{/if}
{/if}