diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
index 9a303b5bf1..4c3587e527 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
@@ -2568,6 +2568,7 @@ void InnerWidget::switchToFilter(FilterId filterId) {
 		filterId = 0;
 	}
 	if (_filterId == filterId) {
+		emit mustScrollTo(0, 0);
 		return;
 	}
 	if (_openedFolder) {
diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp
index 0866182478..b0d81fa5ed 100644
--- a/Telegram/SourceFiles/window/window_session_controller.cpp
+++ b/Telegram/SourceFiles/window/window_session_controller.cpp
@@ -781,7 +781,7 @@ FilterId SessionController::activeChatsFilterCurrent() const {
 }
 
 void SessionController::setActiveChatsFilter(FilterId id) {
-	_activeChatsFilter = id;
+	_activeChatsFilter.force_assign(id);
 	if (id) {
 		closeFolder();
 	}
diff --git a/Telegram/lib_rpl b/Telegram/lib_rpl
index 2888aabf28..9f3bb0e2a9 160000
--- a/Telegram/lib_rpl
+++ b/Telegram/lib_rpl
@@ -1 +1 @@
-Subproject commit 2888aabf28bf9ca89f3d6d67a523bc5f2ce802ce
+Subproject commit 9f3bb0e2a97f9f31b4f2e5d655ad0395c4249e1c