diff --git a/src/popupwin.c b/src/popupwin.c
index 3af35b6f05..d988cbaf9b 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -1056,8 +1056,7 @@ popup_create(typval_T *argvars, typval_T *rettv, create_type_T type)
     {
 	// use existing buffer
 	new_buffer = FALSE;
-	wp->w_buffer = buf;
-	++buf->b_nwindows;
+	win_init_popup_win(wp, buf);
 	buffer_ensure_loaded(buf);
     }
     else
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 32ce96be11..f89d566023 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -1668,4 +1668,9 @@ func Test_popupwin_with_buffer()
   call assert_equal({}, popup_getpos(winid))
   call assert_equal(1, bufloaded(buf))
   exe 'bwipe! ' .. buf
+
+  edit test_popupwin.vim
+  let winid = popup_create(bufnr(''), {})
+  redraw
+  call popup_close(winid)
 endfunc
diff --git a/src/version.c b/src/version.c
index 8a9f34743e..ec541b4679 100644
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1615,
 /**/
     1614,
 /**/