diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 33cf6c6c..e8277fcf 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -754,7 +754,6 @@ void MainWindow::refresh()
         db.updateSchema();
     } else if (currentTab == ui->browser) {
         // Refresh the schema and reload the current table
-        db.updateSchema();
         populateTable();
     } else if (currentTab == ui->pragmas) {
         // Reload pragma values
@@ -2065,6 +2064,8 @@ void MainWindow::loadExtension()
 
 void MainWindow::reloadSettings()
 {
+    Application::reloadSettings();
+
     // Set data browser font
     ui->tableBrowser->reloadSettings();
 
diff --git a/src/TableBrowser.cpp b/src/TableBrowser.cpp
index 34bf4b20..2fc9ced0 100644
--- a/src/TableBrowser.cpp
+++ b/src/TableBrowser.cpp
@@ -423,6 +423,9 @@ void TableBrowser::updateTable()
         return;
     }
 
+    // Update the schema first
+    db->updateSchema();
+
     // Reset the minimum width of the vertical header which could have been modified in updateFilter
     // or in headerClicked.
     ui->dataTable->verticalHeader()->setMinimumWidth(0);