diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index d8d785395c..b8cc8fef6e 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -19528,6 +19528,14 @@ void ex_execute(exarg_T *eap)
   }
 
   if (ret != FAIL && ga.ga_data != NULL) {
+    if (eap->cmdidx == CMD_echomsg || eap->cmdidx == CMD_echoerr) {
+      // Mark the already 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();
+    }
+
     if (eap->cmdidx == CMD_echomsg) {
       MSG_ATTR(ga.ga_data, echo_attr);
       ui_flush();