diff --git a/names.c b/names.c
index 0a3af903..aa0673ea 100644
--- a/names.c
+++ b/names.c
@@ -50,10 +50,6 @@ window_name_callback(unused int fd, unused short events, void *data)
 	if (w->active == NULL)
 		return;
 
-	if (~w->active->flags & PANE_CHANGED)
-		return;
-	w->active->flags &= ~PANE_CHANGED;
-
 	if (!options_get_number(&w->options, "automatic-rename")) {
 		if (event_initialized(&w->name_timer))
 			event_del(&w->name_timer);
@@ -61,6 +57,10 @@ window_name_callback(unused int fd, unused short events, void *data)
 	}
 	queue_window_name(w);
 
+	if (~w->active->flags & PANE_CHANGED)
+		return;
+	w->active->flags &= ~PANE_CHANGED;
+
 	name = format_window_name(w);
 	if (strcmp(name, w->name) != 0) {
 		window_set_name(w, name);