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