diff --git a/src/popupwin.c b/src/popupwin.c
index c9265367bf..ee59af2eae 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -265,6 +265,8 @@ f_popup_create(typval_T *argvars, typval_T *rettv)
     buf->b_p_swf = FALSE;   // no swap file
     buf->b_p_bl = FALSE;    // unlisted buffer
     buf->b_locked = TRUE;
+    // Avoid that 'buftype' is reset when this buffer is entered.
+    buf->b_p_initialized = TRUE;
 
     nr = (int)dict_get_number(d, (char_u *)"tab");
     if (nr == 0)
diff --git a/src/version.c b/src/version.c
index 0420cb60bb..282d045e65 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1427,
 /**/
     1426,
 /**/