diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index 46add89d2..b76d0c31e 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -1122,9 +1122,7 @@ QSharedPointer<Database> BrowserService::selectedDatabase()
     for (int i = 0;; ++i) {
         auto* dbWidget = m_dbTabWidget->databaseWidgetFromIndex(i);
         // Add only open databases
-        if (dbWidget && dbWidget->database()->hasKey()
-            && (dbWidget->currentMode() == DatabaseWidget::Mode::ViewMode
-                || dbWidget->currentMode() == DatabaseWidget::Mode::EditMode)) {
+        if (dbWidget && !dbWidget->isLocked()) {
             databaseWidgets.push_back(dbWidget);
             continue;
         }
diff --git a/src/cli/Create.cpp b/src/cli/Create.cpp
index 68289bf25..c8e3b771f 100644
--- a/src/cli/Create.cpp
+++ b/src/cli/Create.cpp
@@ -121,7 +121,6 @@ int Create::execute(const QStringList& arguments)
 
     QSharedPointer<Database> db(new Database);
     db->setKey(key);
-    db->setInitialized(true);
 
     if (decryptionTime != 0) {
         auto kdf = db->kdf();
diff --git a/src/cli/Import.cpp b/src/cli/Import.cpp
index e34a4cebf..dd7b12c64 100644
--- a/src/cli/Import.cpp
+++ b/src/cli/Import.cpp
@@ -84,7 +84,6 @@ int Import::execute(const QStringList& arguments)
     Database db;
     db.setKdf(KeePass2::uuidToKdf(KeePass2::KDF_ARGON2));
     db.setKey(key);
-    db.setInitialized(true);
 
     if (!db.import(xmlExportPath, &errorMessage)) {
         errorTextStream << QObject::tr("Unable to import XML database: %1").arg(errorMessage) << endl;
diff --git a/src/core/Database.cpp b/src/core/Database.cpp
index a3637bb52..9c59c70bd 100644
--- a/src/core/Database.cpp
+++ b/src/core/Database.cpp
@@ -112,13 +112,6 @@ bool Database::open(QSharedPointer<const CompositeKey> key, QString* error, bool
  */
 bool Database::open(const QString& filePath, QSharedPointer<const CompositeKey> key, QString* error, bool readOnly)
 {
-    if (isInitialized() && m_modified) {
-        emit databaseDiscarded();
-    }
-
-    m_initialized = false;
-    setEmitModified(false);
-
     QFile dbFile(filePath);
     if (!dbFile.exists()) {
         if (error) {
@@ -138,6 +131,8 @@ bool Database::open(const QString& filePath, QSharedPointer<const CompositeKey>
         return false;
     }
 
+    setEmitModified(false);
+
     KeePass2Reader reader;
     if (!reader.readDatabase(&dbFile, std::move(key), this)) {
         if (error) {
@@ -152,7 +147,6 @@ bool Database::open(const QString& filePath, QSharedPointer<const CompositeKey>
 
     markAsClean();
 
-    m_initialized = true;
     emit databaseOpened();
     m_fileWatcher->start(canonicalFilePath(), 30, 1);
     setEmitModified(true);
@@ -220,7 +214,7 @@ bool Database::saveAs(const QString& filePath, QString* error, bool atomic, bool
     }
 
     // Never save an uninitialized database
-    if (!m_initialized) {
+    if (!isInitialized()) {
         if (error) {
             *error = tr("Could not save, database has not been initialized!");
         }
@@ -346,7 +340,7 @@ bool Database::writeDatabase(QIODevice* device, QString* error)
     }
 
     PasswordKey oldTransformedKey;
-    if (m_data.hasKey) {
+    if (m_data.key->isEmpty()) {
         oldTransformedKey.setHash(m_data.transformedMasterKey->rawKey());
     }
 
@@ -440,7 +434,6 @@ void Database::releaseData()
     m_deletedObjects.clear();
     m_commonUsernames.clear();
 
-    m_initialized = false;
     m_modified = false;
     m_modifiedTimer.stop();
 }
@@ -496,22 +489,14 @@ void Database::setReadOnly(bool readOnly)
 }
 
 /**
- * Returns true if database has been fully decrypted and populated, i.e. if
- * it's not just an empty default instance.
+ * Returns true if the database key exists, has subkeys, and the
+ * root group exists
  *
  * @return true if database has been fully initialized
  */
 bool Database::isInitialized() const
 {
-    return m_initialized;
-}
-
-/**
- * @param initialized true to mark database as initialized
- */
-void Database::setInitialized(bool initialized)
-{
-    m_initialized = initialized;
+    return m_data.key && !m_data.key->isEmpty() && m_rootGroup;
 }
 
 Group* Database::rootGroup()
@@ -535,7 +520,7 @@ void Database::setRootGroup(Group* group)
 {
     Q_ASSERT(group);
 
-    if (isInitialized() && m_modified) {
+    if (isInitialized() && isModified()) {
         emit databaseDiscarded();
     }
 
@@ -723,7 +708,6 @@ bool Database::setKey(const QSharedPointer<const CompositeKey>& key,
     if (!key) {
         m_data.key.reset();
         m_data.transformedMasterKey.reset(new PasswordKey());
-        m_data.hasKey = false;
         return true;
     }
 
@@ -733,7 +717,7 @@ bool Database::setKey(const QSharedPointer<const CompositeKey>& key,
     }
 
     PasswordKey oldTransformedMasterKey;
-    if (m_data.hasKey) {
+    if (m_data.key && !m_data.key->isEmpty()) {
         oldTransformedMasterKey.setHash(m_data.transformedMasterKey->rawKey());
     }
 
@@ -749,7 +733,6 @@ bool Database::setKey(const QSharedPointer<const CompositeKey>& key,
     if (!transformedMasterKey.isEmpty()) {
         m_data.transformedMasterKey->setHash(transformedMasterKey);
     }
-    m_data.hasKey = true;
     if (updateChangedTime) {
         m_metadata->setMasterKeyChanged(Clock::currentDateTimeUtc());
     }
@@ -761,14 +744,9 @@ bool Database::setKey(const QSharedPointer<const CompositeKey>& key,
     return true;
 }
 
-bool Database::hasKey() const
-{
-    return m_data.hasKey;
-}
-
 bool Database::verifyKey(const QSharedPointer<CompositeKey>& key) const
 {
-    Q_ASSERT(hasKey());
+    Q_ASSERT(!m_data.key->isEmpty());
 
     if (!m_data.challengeResponseKey->rawKey().isEmpty()) {
         QByteArray result;
diff --git a/src/core/Database.h b/src/core/Database.h
index 74024424d..63a1f8cb6 100644
--- a/src/core/Database.h
+++ b/src/core/Database.h
@@ -81,7 +81,6 @@ public:
     void releaseData();
 
     bool isInitialized() const;
-    void setInitialized(bool initialized);
     bool isModified() const;
     void setEmitModified(bool value);
     bool isReadOnly() const;
@@ -115,7 +114,6 @@ public:
 
     QList<QString> commonUsernames();
 
-    bool hasKey() const;
     QSharedPointer<const CompositeKey> key() const;
     bool setKey(const QSharedPointer<const CompositeKey>& key,
                 bool updateChangedTime = true,
@@ -168,7 +166,6 @@ private:
         QScopedPointer<PasswordKey> transformedMasterKey;
         QScopedPointer<PasswordKey> challengeResponseKey;
 
-        bool hasKey = false;
         QSharedPointer<const CompositeKey> key;
         QSharedPointer<Kdf> kdf = QSharedPointer<AesKdf>::create(true);
 
@@ -190,7 +187,6 @@ private:
             transformedMasterKey.reset();
             challengeResponseKey.reset();
 
-            hasKey = false;
             key.reset();
             kdf.reset();
 
@@ -212,7 +208,6 @@ private:
     QTimer m_modifiedTimer;
     QMutex m_saveMutex;
     QPointer<FileWatcher> m_fileWatcher;
-    bool m_initialized = false;
     bool m_modified = false;
     bool m_emitModified;
 
diff --git a/src/gui/DatabaseTabWidget.cpp b/src/gui/DatabaseTabWidget.cpp
index b0ced46df..6ea8789de 100644
--- a/src/gui/DatabaseTabWidget.cpp
+++ b/src/gui/DatabaseTabWidget.cpp
@@ -671,7 +671,7 @@ void DatabaseTabWidget::relockPendingDatabase()
         return;
     }
 
-    if (m_dbWidgetPendingLock->isLocked() || !m_dbWidgetPendingLock->database()->hasKey()) {
+    if (m_dbWidgetPendingLock->isLocked() || !m_dbWidgetPendingLock->database()->isInitialized()) {
         m_dbWidgetPendingLock = nullptr;
         return;
     }
diff --git a/src/gui/wizard/NewDatabaseWizard.cpp b/src/gui/wizard/NewDatabaseWizard.cpp
index eaadc53ff..34c594046 100644
--- a/src/gui/wizard/NewDatabaseWizard.cpp
+++ b/src/gui/wizard/NewDatabaseWizard.cpp
@@ -57,11 +57,7 @@ NewDatabaseWizard::~NewDatabaseWizard()
 
 bool NewDatabaseWizard::validateCurrentPage()
 {
-    bool ok = m_pages[currentId()]->validatePage();
-    if (ok && currentId() == m_pages.size() - 1) {
-        m_db->setInitialized(true);
-    }
-    return ok;
+    return m_pages[currentId()]->validatePage();
 }
 
 /**
diff --git a/tests/TestKeePass1Reader.cpp b/tests/TestKeePass1Reader.cpp
index 078447acb..30f744e28 100644
--- a/tests/TestKeePass1Reader.cpp
+++ b/tests/TestKeePass1Reader.cpp
@@ -106,7 +106,7 @@ void TestKeePass1Reader::testBasic()
 
 void TestKeePass1Reader::testMasterKey()
 {
-    QVERIFY(m_db->hasKey());
+    QVERIFY(m_db->isInitialized());
     QCOMPARE(m_db->kdf()->rounds(), 713);
 }