diff --git a/src/evalwindow.c b/src/evalwindow.c
index fb54033..be6762a 100644
--- a/src/evalwindow.c
+++ b/src/evalwindow.c
@@ -332,8 +332,6 @@
 	else if (STRCMP(arg, "#") == 0)
 	{
 	    twin = (tp == curtab) ? prevwin : tp->tp_prevwin;
-	    if (twin == NULL)
-		nr = 0;
 	}
 	else
 	{
@@ -360,6 +358,8 @@
 	    else
 		invalid_arg = TRUE;
 	}
+	if (twin == NULL)
+	    nr = 0;
 
 	if (invalid_arg)
 	{
diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index f8f501a..ad5a808 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -2400,9 +2400,14 @@
 
   let origwin = win_getid()
   let ptybuf = term_start(&shell, #{hidden: 1})
-  let winnr = popup_create(ptybuf, #{minwidth: 40, minheight: 10})
+  let winid = popup_create(ptybuf, #{minwidth: 40, minheight: 10})
   " Wait for shell to start
   sleep 200m
+  " Check this doesn't crash
+  call assert_equal(winnr(), winnr('j'))
+  call assert_equal(winnr(), winnr('k'))
+  call assert_equal(winnr(), winnr('h'))
+  call assert_equal(winnr(), winnr('l'))
   " Cannot quit while job is running
   call assert_fails('call feedkeys("\<C-W>:quit\<CR>", "xt")', 'E948:')
   call feedkeys("exit\<CR>", 'xt')
diff --git a/src/version.c b/src/version.c
index 43a03fe..c3dbec8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    204,
+/**/
     203,
 /**/
     202,
diff --git a/src/window.c b/src/window.c
index 23037fe..964f1ef 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4431,6 +4431,11 @@
     frame_T	*nfr;
     frame_T	*foundfr;
 
+#ifdef FEAT_PROP_POPUP
+    if (popup_is_popup(wp))
+	// popups don't have neighbors.
+	return NULL;
+#endif
     foundfr = wp->w_frame;
     while (count--)
     {
@@ -4513,6 +4518,11 @@
     frame_T	*nfr;
     frame_T	*foundfr;
 
+#ifdef FEAT_PROP_POPUP
+    if (popup_is_popup(wp))
+	// popups don't have neighbors.
+	return NULL;
+#endif
     foundfr = wp->w_frame;
     while (count--)
     {