diff --git a/src/gui/EditWidget.cpp b/src/gui/EditWidget.cpp
index ab05758da..1a79d9bad 100644
--- a/src/gui/EditWidget.cpp
+++ b/src/gui/EditWidget.cpp
@@ -84,7 +84,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 b70835770..fd772c291 100644
--- a/src/gui/dbsettings/DatabaseSettingsDialog.cpp
+++ b/src/gui/dbsettings/DatabaseSettingsDialog.cpp
@@ -99,6 +99,8 @@ DatabaseSettingsDialog::~DatabaseSettingsDialog() = default;
 
 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);