diff --git a/src/ex_getln.c b/src/ex_getln.c
index 587a9ff3d..1644de812 100644
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -1603,6 +1603,9 @@ getcmdline_int(
 	made_cmdheight_nonzero = TRUE;
 	lastwin->w_p_so = 0;
 	set_option_value((char_u *)"ch", 1L, NULL, 0);
+#ifdef HAS_MESSAGE_WINDOW
+	popup_hide_message_win();
+#endif
 	update_screen(UPD_VALID);                 // redraw the screen NOW
 	made_cmdheight_nonzero = FALSE;
 	lastwin->w_p_so = save_so;
diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index bb761ab83..00e942e7b 100644
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -398,6 +398,11 @@ func Test_cmdheight_zero()
   if using_popupwin
     redraw
     call assert_equal('test echo', Screenline(&lines))
+
+    " check that the popup is cleared when entering a command line
+    call feedkeys(':', 'xt')
+    redraw
+    call assert_equal('~', Screenline(&lines))
   else
     call assert_equal(116, screenchar(&lines, 1))
   endif
diff --git a/src/version.c b/src/version.c
index 4ff578f59..b25ed44f5 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 */
+/**/
+    293,
 /**/
     292,
 /**/