diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index 2accad9d..8235b3ba 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -510,7 +510,8 @@ static void cmd_window_name(const char *data)
 {
 	if (window_find_name(data) == NULL)
 		window_set_name(active_win, data);
-	else {
+	else if (active_win->name == NULL ||
+		 strcmp(active_win->name, data) != 0) {
 		printformat_window(active_win, MSGLEVEL_CLIENTERROR,
 				   TXT_WINDOW_NAME_NOT_UNIQUE, data);
 	}