diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index 2b90dbb5a..21d5edf51 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -1193,12 +1193,16 @@ class Coder:
         else:
             content = ""
 
+        try:
+            self.reply_completed()
+        except KeyboardInterrupt:
+            interrupted = True
+
         if interrupted:
             content += "\n^C KeyboardInterrupt"
             self.cur_messages += [dict(role="assistant", content=content)]
             return
 
-        self.reply_completed()
         edited = self.apply_updates()
 
         self.update_cur_messages()