diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index 1782f7230e1d05a06abe4788b7883eddd402796a..c065c3de3d83c0eb5b68bf9a3610ff925762c952 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -5207,9 +5207,12 @@ impl ThreadView {
 
         match thinking_display {
             ThinkingBlockDisplay::Auto => {
-                if self.expanded_thinking_blocks.contains(&key) {
+                let is_open = self.expanded_thinking_blocks.contains(&key)
+                    || self.user_toggled_thinking_blocks.contains(&key);
+
+                if is_open {
                     self.expanded_thinking_blocks.remove(&key);
-                    self.user_toggled_thinking_blocks.insert(key);
+                    self.user_toggled_thinking_blocks.remove(&key);
                 } else {
                     self.expanded_thinking_blocks.insert(key);
                     self.user_toggled_thinking_blocks.insert(key);