diff --git a/src/message.c b/src/message.c
index 66bab9e..ffa45a1 100644
--- a/src/message.c
+++ b/src/message.c
@@ -2553,7 +2553,6 @@
 	    {
 		/* Jump to the choices of the dialog. */
 		retval = TRUE;
-		lines_left = Rows - 1;
 	    }
 	    else
 #endif
@@ -2561,6 +2560,9 @@
 		got_int = TRUE;
 		quit_more = TRUE;
 	    }
+	    /* When there is some more output (wrapping line) display that
+	     * without another prompt. */
+	    lines_left = Rows - 1;
 	    break;
 
 #ifdef FEAT_CLIPBOARD
diff --git a/src/version.c b/src/version.c
index 8189b43..6877f67 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    127,
+/**/
     126,
 /**/
     125,