diff --git a/src/message.c b/src/message.c
index 2498412..99fe675 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1747,7 +1747,7 @@
 
     // When drawing over the command line no need to clear it later or remove
     // the mode message.
-    if (msg_row >= cmdline_row && msg_col == 0)
+    if (msg_silent == 0 && len > 0 && msg_row >= cmdline_row && msg_col == 0)
     {
 	clear_cmdline = FALSE;
 	mode_displayed = FALSE;