diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 348c313d9..b50511dbd 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -1788,6 +1788,8 @@ void Widget::escape() {
 			const auto first = list.empty() ? FilterId() : list.front().id();
 			if (controller()->activeChatsFilterCurrent() != first) {
 				controller()->setActiveChatsFilter(first);
+			} else {
+				_search->setFocus();
 			}
 		}
 	} else if (!_searchInChat