diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index a94fb7efc2d15a..bc2ac3f5ba28ac 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -1319,7 +1319,10 @@ void DialogsInner::handlePeerNameChange(not_null<PeerData*> peer, const PeerData
 }
 
 void DialogsInner::onFilterUpdate(QString newFilter, bool force) {
-	auto words = TextUtilities::PrepareSearchWords(newFilter);
+	const auto mentionsSearch = (newFilter == qstr("@"));
+	const auto words = mentionsSearch
+		? QStringList(newFilter)
+		: TextUtilities::PrepareSearchWords(newFilter);
 	newFilter = words.isEmpty() ? QString() : words.join(' ');
 	if (newFilter != _filter || force) {
 		_filter = newFilter;