diff --git a/src/common.h b/src/common.h
index 14bfe42b..192e087d 100644
--- a/src/common.h
+++ b/src/common.h
@@ -6,7 +6,7 @@
 #define IRSSI_GLOBAL_CONFIG "irssi.conf" /* config file name in /etc/ */
 #define IRSSI_HOME_CONFIG "config" /* config file name in ~/.irssi/ */
 
-#define IRSSI_ABI_VERSION 19
+#define IRSSI_ABI_VERSION 20
 
 #define DEFAULT_SERVER_ADD_PORT 6667
 #define DEFAULT_SERVER_ADD_TLS_PORT 6697
diff --git a/src/fe-common/core/fe-windows.h b/src/fe-common/core/fe-windows.h
index aaa773c8..061a999a 100644
--- a/src/fe-common/core/fe-windows.h
+++ b/src/fe-common/core/fe-windows.h
@@ -22,6 +22,7 @@ enum {
 typedef struct {
 	char *servertag;
         char *name;
+	int type;
 	unsigned int sticky:1;
 } WINDOW_BIND_REC;
 
diff --git a/src/fe-common/core/windows-layout.c b/src/fe-common/core/windows-layout.c
index 77eb26f1..5aa60916 100644
--- a/src/fe-common/core/windows-layout.c
+++ b/src/fe-common/core/windows-layout.c
@@ -70,11 +70,12 @@ static void sig_layout_restore_item(WINDOW_REC *window, const char *type,
                 restore_win = window;
 
 		protocol = chat_protocol_find(chat_type);
-		if (protocol == NULL || protocol->not_initialized)
-			window_bind_add(window, tag, name);
-		else if (protocol->query_create != NULL)
+		if (protocol == NULL || protocol->not_initialized) {
+			WINDOW_BIND_REC *rec = window_bind_add(window, tag, name);
+			rec->type = module_get_uniq_id_str("WINDOW ITEM TYPE", "QUERY");
+		} else if (protocol->query_create != NULL) {
 			protocol->query_create(tag, name, TRUE);
-		else {
+		} else {
 			QUERY_REC *query;
 
 			query = g_new0(QUERY_REC, 1);