1 files changed, 2 insertions, 0 deletions

diff --git a/src/window.c b/src/window.c
index 683cdc5b363..493b2cf018d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1232,6 +1232,8 @@ DEFUN ("next-window", Fnext_window, Snext_window, 0, 3, 0,
             window = XWINDOW (window)->vchild;
           else break;
         }
+
+      QUIT;
     }
   /* Which windows are acceptable?
      Exit the loop and accept this window if