diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
index 446b544c7..dfa2fb63f 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp
@@ -639,7 +639,9 @@ void Widget::animationCallback() {
 		updateControlsVisibility(true);
 
 		applyFilterUpdate();
-		if (App::wnd()) App::wnd()->setInnerFocus();
+		if (!_filter->hasFocus()) {
+			if (App::wnd()) App::wnd()->setInnerFocus();
+		}
 	}
 }
 
@@ -1232,6 +1234,9 @@ void Widget::searchInChat(Key chat) {
 }
 
 void Widget::setSearchInChat(Key chat, UserData *from) {
+	if (chat.folder()) {
+		chat = Key();
+	}
 	_searchInMigrated = nullptr;
 	if (const auto peer = chat.peer()) {
 		if (const auto migrateTo = peer->migrateTo()) {
diff --git a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
index 6383a4481..ad04639ff 100644
--- a/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
+++ b/Telegram/SourceFiles/history/view/history_view_top_bar_widget.cpp
@@ -169,9 +169,7 @@ void TopBarWidget::refreshLang() {
 }
 
 void TopBarWidget::onSearch() {
-	if (_activeChat.folder()) {
-		_controller->closeFolder();
-	} else if (_activeChat) {
+	if (_activeChat) {
 		App::main()->searchInChat(_activeChat);
 	}
 }