diff --git a/crates/agent/src/active_thread.rs b/crates/agent/src/active_thread.rs
index b9d820d3ac4d8114184cf8cafb9ef9cba51cd598..7920b2450176915417c7cf02607732397ee915f1 100644
--- a/crates/agent/src/active_thread.rs
+++ b/crates/agent/src/active_thread.rs
@@ -1449,7 +1449,8 @@ impl ActiveThread {
         cx: &Context<Self>,
     ) -> impl IntoElement {
         let is_last_message = self.messages.last() == Some(&message_id);
-        let pending_thinking_segment_index = if is_last_message && !has_tool_uses {
+        let is_generating = self.thread.read(cx).is_generating();
+        let pending_thinking_segment_index = if is_generating && is_last_message && !has_tool_uses {
             rendered_message
                 .segments
                 .iter()