diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 9bc18e34..f4de4846 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -39,10 +39,8 @@
 
 static void signal_channel_created(CHANNEL_REC *channel, void *automatic)
 {
-	if (window_item_find(channel->server, channel->name) == NULL) {
-		window_item_create((WI_ITEM_REC *) channel,
-				   GPOINTER_TO_INT(automatic));
-	}
+	window_item_create((WI_ITEM_REC *) channel,
+			   GPOINTER_TO_INT(automatic));
 }
 
 static void signal_channel_created_curwin(CHANNEL_REC *channel)
diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c
index ce614c89..ce11dd31 100644
--- a/src/fe-common/core/fe-queries.c
+++ b/src/fe-common/core/fe-queries.c
@@ -58,9 +58,6 @@ static void signal_query_created(QUERY_REC *query, gpointer automatic)
 {
 	g_return_if_fail(IS_QUERY(query));
 
-	if (window_item_find(query->server, query->name) != NULL)
-		return;
-
 	window_item_create((WI_ITEM_REC *) query, GPOINTER_TO_INT(automatic));
 	printformat(query->server, query->name, MSGLEVEL_CLIENTNOTICE,
 		    TXT_QUERY_STARTED, query->name);