diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
index a5a2f857..a9b81706 100644
--- a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
+++ b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
@@ -41,6 +41,7 @@
 #include <QFontDatabase>
 #include <QFontDialog>
 #include <QGeoPositionInfo>
+#include <QPushButton>
 #include <QStandardItemModel>
 #include <QToolButton>
 
@@ -291,6 +292,10 @@ SettingsDialog::SettingsDialog(QWidget* parent) :
 {
    ui->setupUi(this);
 
+   // Set OK as default
+   ui->buttonBox->button(QDialogButtonBox::StandardButton::Ok)
+      ->setDefault(true);
+
    // General
    p->SetupGeneralTab();