diff --git a/aider/repo.py b/aider/repo.py
index e0f7ed185..01652b15f 100644
--- a/aider/repo.py
+++ b/aider/repo.py
@@ -344,7 +344,7 @@ class GitRepo:
 
         commit_message = None
         for model in self.models:
-            spinner_text = f"Waiting for {model.name} to generate commit message"
+            spinner_text = f"Generating commit message with {model.name}"
             with WaitingSpinner(spinner_text):
                 num_tokens = model.token_count(messages)
                 max_tokens = model.info.get("max_input_tokens") or 0
diff --git a/aider/waiting.py b/aider/waiting.py
index 4d2164f4f..9c2f72bc7 100644
--- a/aider/waiting.py
+++ b/aider/waiting.py
@@ -179,8 +179,8 @@ class WaitingSpinner:
 
     def _spin(self):
         while not self._stop_event.is_set():
-            time.sleep(self.delay)
             self.spinner.step()
+            time.sleep(self.delay)
         self.spinner.end()
 
     def start(self):
@@ -192,7 +192,7 @@ class WaitingSpinner:
         """Request the spinner to stop and wait briefly for the thread to exit."""
         self._stop_event.set()
         if self._thread.is_alive():
-            self._thread.join(timeout=0.1)
+            self._thread.join(timeout=self.delay)
         self.spinner.end()
 
     # Allow use as a context-manager