diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 6b9c4fb25..6024e7b04 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -3623,7 +3623,9 @@ bool Widget::cancelSearch() {
 	auto updatedState = _searchState;
 	const auto clearingQuery = !updatedState.query.isEmpty();
 	auto clearingInChat = !clearingQuery
-		&& (updatedState.inChat || updatedState.fromPeer);
+		&& (updatedState.inChat
+			|| updatedState.fromPeer
+			|| !updatedState.tags.empty());
 	if (clearingQuery) {
 		updatedState.query = QString();
 	} else if (clearingInChat) {
@@ -3636,6 +3638,7 @@ bool Widget::cancelSearch() {
 		}
 		updatedState.inChat = {};
 		updatedState.fromPeer = nullptr;
+		updatedState.tags = {};
 	}
 	if (!clearingQuery
 		&& _subsectionTopBar