diff --git a/src/popupwin.c b/src/popupwin.c
index 9d60aa22ae..0ff57fb4b1 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2651,6 +2651,8 @@ f_popup_filter_yesno(typval_T *argvars, typval_T *rettv)
 	return;
 
     c = *key;
+    if (c == CAR && need_wait_return)
+	return;
     if (c == K_SPECIAL && key[1] != NUL)
 	c = TO_SPECIAL(key[1], key[2]);
 
diff --git a/src/version.c b/src/version.c
index 4ca8e3f88a..e00d6c8295 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    604,
 /**/
     603,
 /**/