diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index b1efaba008..5d71547658 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -904,6 +904,7 @@ void MainWindow::updateIsActiveHook() {
 }
 
 MainWindow::~MainWindow() {
+	ui_hideSettingsAndLayer(anim::type::instant);
 	if (_clearManager) {
 		_clearManager->stop();
 		_clearManager = nullptr;
diff --git a/Telegram/SourceFiles/window/layer_widget.cpp b/Telegram/SourceFiles/window/layer_widget.cpp
index 77850d4543..6cf87ab4fc 100644
--- a/Telegram/SourceFiles/window/layer_widget.cpp
+++ b/Telegram/SourceFiles/window/layer_widget.cpp
@@ -400,11 +400,16 @@ void LayerStackWidget::hideLayers(anim::type animated) {
 }
 
 void LayerStackWidget::hideAll(anim::type animated) {
-	startAnimation([] {}, [this] {
+	const auto clear = [=] {
 		clearLayers();
 		clearSpecialLayer();
 		_mainMenu.destroyDelayed();
-	}, Action::HideAll, animated);
+	};
+	if (App::quitting()) {
+		clear();
+	} else {
+		startAnimation([] {}, clear, Action::HideAll, animated);
+	}
 }
 
 void LayerStackWidget::hideTopLayer(anim::type animated) {