diff --git a/Telegram/SourceFiles/boxes/peer_list_box.cpp b/Telegram/SourceFiles/boxes/peer_list_box.cpp
index 5a440ced5..67663c16f 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@@ -217,19 +217,7 @@ void PeerListBox::keyPressEvent(QKeyEvent *e) {
 
 void PeerListBox::searchQueryChanged(const QString &query) {
 	scrollToY(0);
-	const auto isEmpty = content()->searchQueryChanged(query);
-	if (_specialTabsMode.enabled) {
-		const auto was = _specialTabsMode.searchIsActive;
-		_specialTabsMode.searchIsActive = !isEmpty;
-		if (was != _specialTabsMode.searchIsActive) {
-			if (_specialTabsMode.searchIsActive) {
-				_specialTabsMode.topSkip = _addedTopScrollSkip;
-				setAddedTopScrollSkip(0);
-			} else {
-				setAddedTopScrollSkip(_specialTabsMode.topSkip);
-			}
-		}
-	}
+	content()->searchQueryChanged(query);
 }
 
 void PeerListBox::resizeEvent(QResizeEvent *e) {
@@ -561,15 +549,6 @@ rpl::producer<int> PeerListBox::multiSelectHeightValue() const {
 	return _select ? _select->heightValue() : rpl::single(0);
 }
 
-void PeerListBox::setSpecialTabMode(bool value) {
-	content()->setIgnoreHiddenRowsOnSearch(value);
-	if (value) {
-		_specialTabsMode.enabled = true;
-	} else {
-		_specialTabsMode = {};
-	}
-}
-
 PeerListRow::PeerListRow(not_null<PeerData*> peer)
 : PeerListRow(peer, peer->id.value) {
 }
@@ -2079,7 +2058,7 @@ void PeerListContent::checkScrollForPreload() {
 	}
 }
 
-PeerListContent::IsEmpty PeerListContent::searchQueryChanged(QString query) {
+void PeerListContent::searchQueryChanged(QString query) {
 	const auto searchWordsList = TextUtilities::PrepareSearchWords(query);
 	const auto normalizedQuery = searchWordsList.join(' ');
 	if (_ignoreHiddenRowsOnSearch && !normalizedQuery.isEmpty()) {
@@ -2136,7 +2115,6 @@ PeerListContent::IsEmpty PeerListContent::searchQueryChanged(QString query) {
 		}
 		refreshRows();
 	}
-	return _normalizedSearchQuery.isEmpty();
 }
 
 std::unique_ptr<PeerListState> PeerListContent::saveState() const {
diff --git a/Telegram/SourceFiles/boxes/peer_list_box.h b/Telegram/SourceFiles/boxes/peer_list_box.h
index bd71470a7..3c0dade70 100644
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@@ -652,8 +652,7 @@ public:
 	[[nodiscard]] bool hasPressed() const;
 	void clearSelection();
 
-	using IsEmpty = bool;
-	IsEmpty searchQueryChanged(QString query);
+	void searchQueryChanged(QString query);
 	bool submitted();
 
 	PeerListRowId updateFromParentDrag(QPoint globalPosition);
@@ -1108,8 +1107,6 @@ public:
 	[[nodiscard]] std::vector<not_null<PeerData*>> collectSelectedRows();
 	[[nodiscard]] rpl::producer<int> multiSelectHeightValue() const;
 
-	void setSpecialTabMode(bool value);
-
 	void peerListSetTitle(rpl::producer<QString> title) override {
 		setTitle(std::move(title));
 	}
@@ -1175,11 +1172,4 @@ private:
 	bool _scrollBottomFixed = false;
 	int _addedTopScrollSkip = 0;
 
-	struct SpecialTabsMode final {
-		bool enabled = false;
-		bool searchIsActive = false;
-		int topSkip = 0;
-	};
-	SpecialTabsMode _specialTabsMode;
-
 };
diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp
index cbe0dd813..9ec50c3a0 100644
--- a/Telegram/SourceFiles/window/window_peer_menu.cpp
+++ b/Telegram/SourceFiles/window/window_peer_menu.cpp
@@ -2234,7 +2234,6 @@ QPointer<Ui::BoxContent> ShowForwardMessagesBox(
 		auto init = [=](not_null<ListBox*> box) {
 			controllerRaw->setSearchNoResultsText(
 				tr::lng_bot_chats_not_found(tr::now));
-			box->setSpecialTabMode(true);
 			const auto chatsFilters = Ui::AddChatFiltersTabsStrip(
 				box,
 				session,