diff --git a/server-client.c b/server-client.c
index da24e222..8e298954 100644
--- a/server-client.c
+++ b/server-client.c
@@ -717,6 +717,7 @@ server_client_loop(void)
 			}
 			wp->flags &= ~PANE_REDRAW;
 		}
+		check_window_name(w);
 	}
 }
 
diff --git a/server.c b/server.c
index d21acbe9..9cddecd3 100644
--- a/server.c
+++ b/server.c
@@ -249,13 +249,11 @@ server_start(int lockfd, char *lockfile)
 void
 server_loop(void)
 {
-	struct window	*w;
-
 	while (!server_should_shutdown()) {
+		log_debug("event dispatch enter");
 		event_loop(EVLOOP_ONCE);
+		log_debug("event dispatch exit");
 
-		RB_FOREACH(w, windows, &windows)
-		    check_window_name(w);
 		server_client_loop();
 	}
 }