diff --git a/codeaide/ui/chat_window.py b/codeaide/ui/chat_window.py
index de388f8..a5e7eb0 100644
--- a/codeaide/ui/chat_window.py
+++ b/codeaide/ui/chat_window.py
@@ -176,6 +176,7 @@ def handle_api_key_input(self, api_key):
 
     def handle_response(self, response):
         self.enable_ui_elements()
+        self.remove_thinking_messages()
 
         if response["type"] == "message":
             self.add_to_chat("AI", response["message"])