diff --git a/Telegram/SourceFiles/window/window_filters_menu.cpp b/Telegram/SourceFiles/window/window_filters_menu.cpp
index 4842c3f73..a0255e9ff 100644
--- a/Telegram/SourceFiles/window/window_filters_menu.cpp
+++ b/Telegram/SourceFiles/window/window_filters_menu.cpp
@@ -194,7 +194,11 @@ void FiltersMenu::refresh() {
 	// so we have to restore it.
 	_scroll.scrollToY(oldTop);
 	const auto i = _filters.find(_activeFilterId);
-	scrollToButton((i != end(_filters)) ? i->second : _all);
+	if (i != end(_filters)) {
+		scrollToButton(i->second);
+	} else if (!cHideFilterAllChats()) {
+		scrollToButton(_all);
+	}
 
 	if (FiltersFirstLoad) {
 		_session->setActiveChatsFilter(cDefaultFilterId());