diff --git a/src/gui.c b/src/gui.c
index ea049c3..88b5d7b 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -4166,7 +4166,7 @@
     /* avoid that moving components around generates events */
     ++hold_gui_events;
 
-    FOR_ALL_WINDOWS(wp)
+    for (wp = firstwin; wp != NULL; wp = W_NEXT(wp))
     {
 	if (wp->w_buffer == NULL)	/* just in case */
 	    continue;