diff --git a/src/qt/walletframe.cpp b/src/qt/walletframe.cpp
--- a/src/qt/walletframe.cpp
+++ b/src/qt/walletframe.cpp
@@ -88,6 +88,7 @@
 
     WalletView *walletView = mapWalletViews.take(name);
     walletStack->removeWidget(walletView);
+    delete walletView;
     return true;
 }
 
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -773,6 +773,7 @@
                 if (!fMockDb) {
                     fs::remove_all(fs::path(strPath) / "database");
                 }
+                g_dbenvs.erase(strPath);
             }
         }
     }
@@ -868,5 +869,8 @@
 void BerkeleyDatabase::Flush(bool shutdown) {
     if (!IsDummy()) {
         env->Flush(shutdown);
+        if (shutdown) {
+            env = nullptr;
+        }
     }
 }