diff --git a/Telegram/SourceFiles/core/crash_report_window.cpp b/Telegram/SourceFiles/core/crash_report_window.cpp
index da086d008..d4af5ad8e 100644
--- a/Telegram/SourceFiles/core/crash_report_window.cpp
+++ b/Telegram/SourceFiles/core/crash_report_window.cpp
@@ -206,6 +206,7 @@ void NotStartedWindow::updateControls() {
 
 void NotStartedWindow::closeEvent(QCloseEvent *e) {
 	deleteLater();
+	App::quit();
 }
 
 void NotStartedWindow::resizeEvent(QResizeEvent *e) {
@@ -964,11 +965,6 @@ void LastCrashedWindow::onUpdateFailed() {
 }
 
 void LastCrashedWindow::onContinue() {
-	if (CrashReports::Restart() == CrashReports::CantOpen) {
-		new NotStartedWindow();
-	} else {
-		_launch();
-	}
 	close();
 }
 
@@ -1017,6 +1013,12 @@ void LastCrashedWindow::onSendingProgress(qint64 uploaded, qint64 total) {
 
 void LastCrashedWindow::closeEvent(QCloseEvent *e) {
 	deleteLater();
+
+	if (CrashReports::Restart() == CrashReports::CantOpen) {
+		new NotStartedWindow();
+	} else {
+		_launch();
+	}
 }
 
 void LastCrashedWindow::resizeEvent(QResizeEvent *e) {
@@ -1142,6 +1144,7 @@ void NetworkSettingsWindow::onSave() {
 }
 
 void NetworkSettingsWindow::closeEvent(QCloseEvent *e) {
+	deleteLater();
 }
 
 void NetworkSettingsWindow::updateControls() {
diff --git a/Telegram/SourceFiles/core/crash_report_window.h b/Telegram/SourceFiles/core/crash_report_window.h
index f9c1cb2b1..8599739bd 100644
--- a/Telegram/SourceFiles/core/crash_report_window.h
+++ b/Telegram/SourceFiles/core/crash_report_window.h
@@ -234,16 +234,3 @@ private:
 	QWidget *_parent;
 
 };
-
-class ShowCrashReportWindow : public PreLaunchWindow {
-public:
-	ShowCrashReportWindow(const QString &text);
-
-protected:
-	void resizeEvent(QResizeEvent *e);
-	void closeEvent(QCloseEvent *e);
-
-private:
-	PreLaunchLog _log;
-
-};