diff --git a/src/custom_widgets/message_widget.py b/src/custom_widgets/message_widget.py
index 7e68f55..94db58c 100644
--- a/src/custom_widgets/message_widget.py
+++ b/src/custom_widgets/message_widget.py
@@ -458,8 +458,11 @@ class message(Gtk.Overlay):
                 window.save_history(chat)
         else:
             if self.spinner:
-                self.container.remove(self.spinner)
+                GLib.idle_add(self.container.remove, self.spinner)
                 self.spinner = None
+            chat_tab = window.chat_list_box.get_tab_by_name(chat.get_name())
+            if chat_tab.spinner:
+                GLib.idle_add(chat_tab.spinner.set_visible, False)
             sys.exit()
 
     def set_text(self, text:str=None):
diff --git a/src/window.py b/src/window.py
index a074f7a..0ce6b1b 100644
--- a/src/window.py
+++ b/src/window.py
@@ -554,7 +554,7 @@ Generate a title following these rules:
         if self.regenerate_button:
             GLib.idle_add(self.chat_list_box.get_current_chat().remove, self.regenerate_button)
         try:
-            response = self.ollama_instance.request("POST", "api/chat", json.dumps(data), lambda data, message_element=message_element: GLib.idle_add(message_element.update_message, data))
+            response = self.ollama_instance.request("POST", "api/chat", json.dumps(data), lambda data, message_element=message_element: message_element.update_message(data))
             if response.status_code != 200:
                 raise Exception('Network Error')
         except Exception as e: