1 files changed, 6 insertions, 1 deletions
diff --git a/names.c b/names.c
index 469f9123..a20d8cfc 100644
--- a/names.c
+++ b/names.c
@@ -49,7 +49,12 @@ window_name_callback(unused int fd, unused short events, void *data)
 	struct window	*w = data;
 	char		*name, *wname;
 
-	queue_window_name(w); /* stopped when option turned off */
+	if (!options_get_number(&w->options, "automatic-rename")) {
+		if (event_initialized(&w->name_timer))
+			event_del(&w->name_timer);
+		return;
+	}
+	queue_window_name(w);
 
 	if (w->active->screen != &w->active->base)
 		name = NULL;