diff --git a/src/message.c b/src/message.c
index 83c8b4f..80d6a18 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1446,6 +1446,9 @@
 {
     int		did_return = FALSE;
 
+    if (msg_row < cmdline_row)
+	msg_row = cmdline_row;
+
     if (!msg_silent)
     {
 	VIM_CLEAR(keep_msg);