diff --git a/src/message.c b/src/message.c
index 096f274dd3..e4f8af11af 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1077,6 +1077,7 @@ ex_messages(exarg_T *eap)
     }
 
     msg_hist_off = TRUE;
+    dont_use_message_window();
 
     p = first_msg_hist;
     if (eap->addr_count != 0)
diff --git a/src/normal.c b/src/normal.c
index 6fcdaeb78e..12b611e174 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -6820,7 +6820,14 @@ nv_esc(cmdarg_T *cap)
 	redraw_curbuf_later(UPD_INVERTED);
     }
     else if (no_reason)
-	vim_beep(BO_ESC);
+    {
+#ifdef HAS_MESSAGE_WINDOW
+	if (popup_message_win_visible())
+	    popup_hide_message_win();
+	else
+#endif
+	    vim_beep(BO_ESC);
+    }
     clearop(cap->oap);
 
     // A CTRL-C is often used at the start of a menu.  When 'insertmode' is
diff --git a/src/version.c b/src/version.c
index c69e46c491..d8a68626ca 100644
--- a/src/version.c
+++ b/src/version.c
@@ -707,6 +707,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    310,
 /**/
     309,
 /**/