diff --git a/aider/models.py b/aider/models.py
index 3c30e38fa..d0f137278 100644
--- a/aider/models.py
+++ b/aider/models.py
@@ -488,6 +488,8 @@ class Model(ModelSettings):
 
         if not self.editor_edit_format:
             self.editor_edit_format = self.editor_model.edit_format
+            if self.editor_edit_format in ("diff", "whole"):
+                self.editor_edit_format = "editor-" + self.editor_edit_format
 
         return self.editor_model