diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index f2fb646..58ea7c8 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7886,6 +7886,9 @@
 {
     win_T	*curwin_save = curwin;
 
+    if (ERROR_IF_ANY_POPUP_WINDOW)
+	return;
+
     // Open the preview window or popup and make it the current window.
     g_do_tagpreview = p_pvh;
     prepare_tagpreview(TRUE, TRUE, FALSE);
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index d89824d..9cd6e32 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -926,6 +926,7 @@
   call assert_fails('call win_execute(winid, "tabnext")', 'E994:')
   call assert_fails('call win_execute(winid, "next")', 'E994:')
   call assert_fails('call win_execute(winid, "rewind")', 'E994:')
+  call assert_fails('call win_execute(winid, "pedit filename")', 'E994:')
   call assert_fails('call win_execute(winid, "buf")', 'E994:')
   call assert_fails('call win_execute(winid, "bnext")', 'E994:')
   call assert_fails('call win_execute(winid, "bprev")', 'E994:')
diff --git a/src/version.c b/src/version.c
index 18e0c14..0c0cebe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    367,
+/**/
     366,
 /**/
     365,