diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index ec9fa548e..da6efc8d1 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -229,7 +229,8 @@ void Controller::setupSideBar() {
 		sideBarChanged();
 	}, _sessionController->lifetime());
 
-	if (_sessionController->session().settings().dialogsFiltersEnabled()) {
+	if (_sessionController->session().settings().dialogsFiltersEnabled()
+		&& !Core::App().settings().chatFiltersHorizontal()) {
 		_sessionController->toggleFiltersMenu(true);
 	} else {
 		sideBarChanged();
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 06ce1e528..8a05d59e5 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -1314,7 +1314,14 @@ SessionController::SessionController(
 		closeFolder();
 	}, lifetime());
 
-	session->data().chatsFilters().changed(
+	rpl::merge(
+		session->data().chatsFilters().changed() | rpl::filter([=] {
+			return session->data().chatsFilters().loaded();
+		}) | rpl::map([] {
+			return Core::App().settings().chatFiltersHorizontalValue(
+			) | rpl::to_empty;
+		}) | rpl::flatten_latest(),
+		session->data().chatsFilters().changed()
 	) | rpl::start_with_next([=] {
 		checkOpenedFilter();
 		crl::on_main(this, [=] {
@@ -1550,7 +1557,8 @@ void SessionController::toggleFiltersMenu(bool enabled) {
 }
 
 void SessionController::refreshFiltersMenu() {
-	toggleFiltersMenu(session().data().chatsFilters().has());
+	toggleFiltersMenu(session().data().chatsFilters().has()
+		&& !Core::App().settings().chatFiltersHorizontal());
 }
 
 rpl::producer<> SessionController::filtersMenuChanged() const {