diff --git a/aider/commands.py b/aider/commands.py
index 401baebe1..737ba05a4 100644
--- a/aider/commands.py
+++ b/aider/commands.py
@@ -1367,7 +1367,8 @@ class Commands:
         user_input = pipe_editor(initial_content, suffix="md", editor=self.editor)
         self.io.user_input(user_input, log_only=False)
         self.io.add_to_input_history(user_input)
-        return user_input
+        if user_input.strip():
+            self.io.set_placeholder(user_input.rstrip())
 
 
 def expand_subdir(file_path):
diff --git a/aider/io.py b/aider/io.py
index 083245a8a..ea7229730 100644
--- a/aider/io.py
+++ b/aider/io.py
@@ -429,7 +429,7 @@ class InputOutput:
             try:
                 if self.prompt_session:
                     # Use placeholder if set, then clear it
-                    default = self.placeholder
+                    default = self.placeholder or ""
                     self.placeholder = None
 
                     line = self.prompt_session.prompt(