diff --git a/src/ChangeLog b/src/ChangeLog
index ae314a7209e..fbf1f1aeb99 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+1999-10-24  Gerd Moellmann  <gerd@gnu.org>
+
+	* window.c (Fnext_window): Add a QUIT in the loop.
+
 1999-10-23  Gerd Moellmann  <gerd@gnu.org>
 
 	* Makefile.in (bootstrap, bootstrap-emacs, bootstrap-temacs): 
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