diff --git a/src/eval.c b/src/eval.c
index bfb72b1..bf0363a 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -20493,9 +20493,10 @@
 		 * may cause a message to appear. */
 		if (eap->cmdidx == CMD_echo)
 		{
-		    /* Put the output below the command, makes scrolling back
-		     * at more prompt work. */
-		    msg_didout = TRUE;
+		    /* Mark the saved text as finishing the line, so that what
+		     * follows is displayed on a new line when scrolling back
+		     * at the more prompt. */
+		    msg_sb_eol();
 		    msg_start();
 		}
 	    }