diff --git a/src/libwalletqt/Wallet.cpp b/src/libwalletqt/Wallet.cpp
index 178e546..3cbefcb 100644
--- a/src/libwalletqt/Wallet.cpp
+++ b/src/libwalletqt/Wallet.cpp
@@ -1249,7 +1249,9 @@ Wallet::Wallet(Monero::Wallet *w, QObject *parent)
     m_daemonUsername = "";
     m_daemonPassword = "";
 
-    startRefreshThread();
+    if (this->status() == Status_Ok) {
+        startRefreshThread();
+    }
 }
 
 Wallet::~Wallet()
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 4191ef6..2ba9ec0 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -515,6 +515,10 @@ WalletWizard *MainWindow::createWizard(WalletWizard::Page startPage){
     auto *wizard = new WalletWizard(m_ctx, startPage, this);
     connect(wizard, &WalletWizard::openWallet, m_ctx, &AppContext::onOpenWallet);
     connect(wizard, &WalletWizard::defaultWalletDirChanged, m_windowSettings, &Settings::updatePaths);
+    connect(wizard, &WalletWizard::rejected, [this]{
+        this->cleanupBeforeClose();
+        QCoreApplication::quit();
+    });
     return wizard;
 }