diff --git a/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx b/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx
index 405fe616d..676213f60 100644
--- a/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx
+++ b/apps/ai-game-creator-shell/src/features/project-workspace/ProjectSupervisorView.tsx
@@ -522,15 +522,6 @@ export function ProjectSupervisorView({
               Boolean(anchoredTurnId) && nextTurnId !== anchoredTurnId;
             return (
               <Fragment key={message.messageId ?? `${message.role}-${index}`}>
-                {anchoredToolCalls.length > 0 ? (
-                  <ToolCallGroup
-                    calls={anchoredToolCalls}
-                    userSentAt={userMessageUpdatedAtForTurn(
-                      anchoredTurnId ?? '',
-                    )}
-                    className="message-tool-call"
-                  />
-                ) : null}
                 <div className={`message message--${message.role}`}>
                   <ChatMarkdownMessage
                     role={message.role}
@@ -546,20 +537,21 @@ export function ProjectSupervisorView({
                     </details>
                   ) : null}
                 </div>
+                {anchoredToolCalls.length > 0 ? (
+                  <ToolCallGroup
+                    calls={anchoredToolCalls}
+                    userSentAt={userMessageUpdatedAtForTurn(
+                      anchoredTurnId ?? '',
+                    )}
+                    className="message-tool-call"
+                  />
+                ) : null}
                 {isTurnEnd && anchoredTurnId && anchoredTurnId !== activeTurnId
                   ? renderTurnUsage(anchoredTurnId)
                   : null}
               </Fragment>
             );
           })}
-          {liveToolCalls.length > 0 ? (
-            <ToolCallGroup
-              calls={liveToolCalls}
-              userSentAt={userMessageUpdatedAtForTurn(liveToolCallTurnId)}
-              active
-              className="message-tool-call"
-            />
-          ) : null}
           {liveToolCallTurnId &&
           liveToolCallTurnId !== activeTurnId &&
           !visibleMessages.some(
@@ -595,6 +587,14 @@ export function ProjectSupervisorView({
               />
             </div>
           ) : null}
+          {liveToolCalls.length > 0 ? (
+            <ToolCallGroup
+              calls={liveToolCalls}
+              userSentAt={userMessageUpdatedAtForTurn(liveToolCallTurnId)}
+              active
+              className="message-tool-call"
+            />
+          ) : null}
           {showDesignReasoning &&
             designReasoningEntries
               .filter((entry) => !entry.messageId)