diff --git a/src/fe-common/core/fe-queries.c b/src/fe-common/core/fe-queries.c
index dba01817..27940e1a 100644
--- a/src/fe-common/core/fe-queries.c
+++ b/src/fe-common/core/fe-queries.c
@@ -61,9 +61,10 @@ static void signal_query_created(QUERY_REC *query, gpointer automatic)
 	if (window_item_window(query) == NULL) {
 		window_item_create((WI_ITEM_REC *) query,
 				   GPOINTER_TO_INT(automatic));
-		printformat(query->server, query->name, MSGLEVEL_CLIENTNOTICE,
-			    TXT_QUERY_STARTED, query->name);
 	}
+
+	printformat(query->server, query->name, MSGLEVEL_CLIENTNOTICE,
+		    TXT_QUERY_START, query->name);
 }
 
 static void signal_query_created_curwin(QUERY_REC *query)
@@ -81,6 +82,9 @@ static void signal_query_destroyed(QUERY_REC *query)
 
 	window = window_item_window((WI_ITEM_REC *) query);
 	if (window != NULL) {
+		printformat(query->server, query->name, MSGLEVEL_CLIENTNOTICE,
+			    TXT_QUERY_STOP, query->name);
+
 		window_item_destroy((WI_ITEM_REC *) query);
 
 		if (!query->unwanted)
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index 6e84a9ce..db20cd35 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -118,6 +118,7 @@ FORMAT_REC fecommon_core_formats[] = {
 	{ NULL, "Queries", 0 },
 
 	{ "query_start", "Starting query with {nick $0}", 1, { 0 } },
+	{ "query_stop", "Closing query with {nick $0}", 1, { 0 } },
 	{ "no_query", "No query with {nick $0}", 1, { 0 } },
 	{ "query_server_changed", "Query with {nick $0} changed to server {server $1}", 2, { 0, 0 } },
 	{ "query_move_notify", "Query with {nick $0} is already created to window $1, use \"/WINDOW ITEM MOVE $0\" to move it to this window", 2, { 0, 1 } },
diff --git a/src/fe-common/core/module-formats.h b/src/fe-common/core/module-formats.h
index de7177f1..ab88bcf8 100644
--- a/src/fe-common/core/module-formats.h
+++ b/src/fe-common/core/module-formats.h
@@ -91,7 +91,8 @@ enum {
 
 	TXT_FILL_5,
 
-	TXT_QUERY_STARTED,
+	TXT_QUERY_START,
+	TXT_QUERY_STOP,
 	TXT_NO_QUERY,
 	TXT_QUERY_SERVER_CHANGED,
         TXT_QUERY_MOVE_NOTIFY,