diff --git a/names.c b/names.c
index 6a333a07..6ff272bd 100644
--- a/names.c
+++ b/names.c
@@ -1,4 +1,4 @@
-/* $Id: names.c,v 1.13 2009-08-19 09:04:48 nicm Exp $ */
+/* $Id: names.c,v 1.14 2009-08-20 11:44:18 tcunha Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -42,8 +42,6 @@ set_window_names(void)
 		w = ARRAY_ITEM(&windows, i);
 		if (w == NULL || w->active == NULL)
 			continue;
-		if (!options_get_number(&w->options, "automatic-rename"))
-			continue;
 
 		if (timercmp(&tv, &w->name_timer, <))
 			continue;
@@ -52,6 +50,9 @@ set_window_names(void)
 		tv2.tv_usec = NAME_INTERVAL * 1000L;
 		timeradd(&w->name_timer, &tv2, &w->name_timer);
 
+		if (!options_get_number(&w->options, "automatic-rename"))
+			continue;
+
 		if (w->active->screen != &w->active->base)
 			name = NULL;
 		else