diff --git a/src/fe-common/core/window-commands.c b/src/fe-common/core/window-commands.c
index 217f5166..c716e1d9 100644
--- a/src/fe-common/core/window-commands.c
+++ b/src/fe-common/core/window-commands.c
@@ -35,6 +35,11 @@
 
 static void cmd_window(const char *data, void *server, WI_ITEM_REC *item)
 {
+	if (is_numeric(data, 0)) {
+                signal_emit("command window refnum", 3, data, server, item);
+		return;
+	}
+
 	command_runsub("window", data, server, item);
 }