diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
index a730ed4a8..5f6c796ba 100644
--- a/share/translations/keepassxc_en.ts
+++ b/share/translations/keepassxc_en.ts
@@ -1811,6 +1811,10 @@ Are you sure you want to continue with this file?.</source>
         <source>Secret Service Integration</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Database Settings: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DatabaseSettingsWidgetBrowser</name>
diff --git a/src/gui/EditWidget.cpp b/src/gui/EditWidget.cpp
index 9eb63810e..ee8c9b9dd 100644
--- a/src/gui/EditWidget.cpp
+++ b/src/gui/EditWidget.cpp
@@ -86,7 +86,7 @@ int EditWidget::pageIndex(const QWidget* widget) const
 
     for (int i = 0; i < m_ui->stackedWidget->count(); i++) {
         auto* scrollArea = qobject_cast<QScrollArea*>(m_ui->stackedWidget->widget(i));
-        if (scrollArea && scrollArea->widget() == widget) {
+        if (scrollArea && (scrollArea == widget || scrollArea->widget() == widget)) {
             return i;
         }
     }
diff --git a/src/gui/dbsettings/DatabaseSettingsDialog.cpp b/src/gui/dbsettings/DatabaseSettingsDialog.cpp
index 5d42cfe5f..c14f3b8c4 100644
--- a/src/gui/dbsettings/DatabaseSettingsDialog.cpp
+++ b/src/gui/dbsettings/DatabaseSettingsDialog.cpp
@@ -97,6 +97,10 @@ DatabaseSettingsDialog::~DatabaseSettingsDialog()
 
 void DatabaseSettingsDialog::load(const QSharedPointer<Database>& db)
 {
+    // Default to the main page on load
+    setCurrentPage(0);
+    setHeadline(tr("Database Settings: %1").arg(db->canonicalFilePath()));
+
     m_generalWidget->loadSettings(db);
     m_databaseKeyWidget->loadSettings(db);
     m_encryptionWidget->loadSettings(db);