diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index e6054dc3d..419bf6c50 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -684,13 +684,16 @@ void Widget::animationCallback() {
 void Widget::escape() {
 	if (controller()->openedFolder().current()) {
 		controller()->closeFolder();
-	} else if (!onCancelSearch()
-		|| (!_searchInChat && !App::main()->selectingPeer())) {
+	} else if (!onCancelSearch()) {
 		if (controller()->activeChatEntryCurrent().key) {
 			emit cancelled();
 		} else if (controller()->activeChatsFilterCurrent()) {
 			controller()->setActiveChatsFilter(FilterId(0));
 		}
+	} else if (!_searchInChat && !App::main()->selectingPeer()) {
+		if (controller()->activeChatEntryCurrent().key) {
+			emit cancelled();
+		}
 	}
 }