1 files changed, 5 insertions, 0 deletions
diff --git a/window.c b/window.c
index bfd13b1c..77c7a633 100644
--- a/window.c
+++ b/window.c
@@ -299,6 +299,8 @@ window_create1(u_int sx, u_int sy)
 		fatal("gettimeofday failed");
 
 	options_init(&w->options, &global_w_options);
+	if (options_get_number(&w->options, "automatic-rename"))
+		queue_window_name(w);
 
 	w->references = 0;
 
@@ -347,6 +349,9 @@ window_destroy(struct window *w)
 		layout_free_cell(w->saved_layout_root);
 	free(w->old_layout);
 
+	if (event_initialized(&w->name_timer))
+		evtimer_del(&w->name_timer);
+
 	options_free(&w->options);
 
 	window_destroy_panes(w);