diff --git a/src/format/KeePass2.cpp b/src/format/KeePass2.cpp
index d58e8bbfd..30fb304c7 100644
--- a/src/format/KeePass2.cpp
+++ b/src/format/KeePass2.cpp
@@ -51,7 +51,7 @@ const QList<QPair<Uuid, QString>> KeePass2::CIPHERS{
 };
 
 const QList<QPair<Uuid, QString>> KeePass2::KDFS{
-    qMakePair(KeePass2::KDF_ARGON2, QObject::tr("Argon2 (recommended)")),
+    qMakePair(KeePass2::KDF_ARGON2, QObject::tr("Argon2 (KDBX 4 – recommended)")),
     qMakePair(KeePass2::KDF_AES_KDBX4, QObject::tr("AES-KDF (KDBX 4)")),
     qMakePair(KeePass2::KDF_AES_KDBX3, QObject::tr("AES-KDF (KDBX 3.1)"))
 };
diff --git a/src/gui/DatabaseSettingsWidget.cpp b/src/gui/DatabaseSettingsWidget.cpp
index c0cc06296..d145a2381 100644
--- a/src/gui/DatabaseSettingsWidget.cpp
+++ b/src/gui/DatabaseSettingsWidget.cpp
@@ -132,6 +132,7 @@ void DatabaseSettingsWidget::load(Database* db)
     }
 
     m_uiGeneral->dbNameEdit->setFocus();
+    m_ui->categoryList->setCurrentCategory(0);
 }
 
 void DatabaseSettingsWidget::save()