diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5f682b6..bcbae29 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -894,6 +894,8 @@ void MainWindow::menuNewRestoreClicked() {
 }
 
 void MainWindow::menuQuitClicked() {
+    cleanupBeforeClose();
+
     QCoreApplication::quit();
 }
 
@@ -967,10 +969,7 @@ void MainWindow::homeWidgetChanged(const QString &widgetName) {
 }
 
 void MainWindow::closeEvent(QCloseEvent *event) {
-    m_ctx->walletManager->closeWallet();
-    m_ctx->tor->stop();
-
-    this->saveGeo();
+    cleanupBeforeClose();
 
     QWidget::closeEvent(event);
 }
@@ -1141,6 +1140,13 @@ void MainWindow::importOutputs() {
     }
 }
 
+void MainWindow::cleanupBeforeClose() {
+    m_ctx->walletManager->closeWallet();
+    m_ctx->tor->stop();
+
+    this->saveGeo();
+}
+
 MainWindow::~MainWindow() {
     delete ui;
 }
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 772703d..5ccf827 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -125,6 +125,7 @@ private:
 
     static MainWindow * pMainWindow;
     void closeEvent(QCloseEvent *event) override;
+    void cleanupBeforeClose();
     void create_status_bar();
     void initMain();
     void loadSkins();