diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp
index cea57e096b..d56d252e2c 100644
--- a/Telegram/SourceFiles/window/window_main_menu.cpp
+++ b/Telegram/SourceFiles/window/window_main_menu.cpp
@@ -664,7 +664,11 @@ void MainMenu::setupArchiveButton() {
 	) | rpl::filter([](Data::Folder *folder) {
 		return folder && (folder->id() == Data::Folder::kId);
 	}) | rpl::start_with_next([=](Data::Folder *folder) {
-		_archiveButton->setVisible(checkArchive());
+		const auto isArchiveVisible = checkArchive();
+		_archiveButton->setVisible(isArchiveVisible);
+		if (!isArchiveVisible) {
+			_contextMenu = nullptr;
+		}
 		update();
 	}, lifetime());
 }