diff --git a/src/popupmenu.c b/src/popupmenu.c
index f4f210b5d..c8d305cbc 100644
--- a/src/popupmenu.c
+++ b/src/popupmenu.c
@@ -858,6 +858,7 @@ pum_set_selected(int n, int repeat UNUSED)
 			// Edit a new, empty buffer. Set options for a "wipeout"
 			// buffer.
 			set_option_value((char_u *)"swf", 0L, NULL, OPT_LOCAL);
+			set_option_value((char_u *)"bl", 0L, NULL, OPT_LOCAL);
 			set_option_value((char_u *)"bt", 0L,
 					       (char_u *)"nofile", OPT_LOCAL);
 			set_option_value((char_u *)"bh", 0L,
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 50d4715e7..3f13b26a1 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -3215,6 +3215,9 @@ func Get_popupmenu_lines()
       call setline(1, 'text text text text text text text ')
       func ChangeColor()
 	let id = popup_findinfo()
+	if buflisted(winbufnr(id))
+	  call setline(1, 'buffer is listed')
+	endif
 	eval id->popup_setoptions(#{highlight: 'InfoPopup'})
       endfunc
 
diff --git a/src/version.c b/src/version.c
index 8eec20e66..3c39f0e18 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2123,
 /**/
     2122,
 /**/