diff --git a/crates/assistant2/src/thread.rs b/crates/assistant2/src/thread.rs
index 2cad563ab525c485ee6dd7a7592db701b08564c9..7aa9040dce4815d7c6cc65cc1c22155aff657020 100644
--- a/crates/assistant2/src/thread.rs
+++ b/crates/assistant2/src/thread.rs
@@ -200,7 +200,7 @@ impl Thread {
     }
 
     pub fn is_streaming(&self) -> bool {
-        !self.pending_completions.is_empty()
+        !self.pending_completions.is_empty() || !self.all_tools_finished()
     }
 
     pub fn tools(&self) -> &Arc<ToolWorkingSet> {