diff --git a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
index 15c624b9..a5a2f857 100644
--- a/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
+++ b/scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
@@ -521,12 +521,6 @@ void SettingsDialogImpl::SetupGeneralTab()
    settings::GeneralSettings& generalSettings =
       settings::GeneralSettings::Instance();
 
-   theme_.SetSettingsVariable(generalSettings.theme());
-   SCWX_SETTINGS_COMBO_BOX(theme_,
-                           self_->ui->themeComboBox,
-                           types::UiStyleIterator(),
-                           types::GetUiStyleName);
-   theme_.SetResetButton(self_->ui->resetThemeButton);
 
    QObject::connect(
          self_->ui->themeComboBox,
@@ -542,6 +536,13 @@ void SettingsDialogImpl::SetupGeneralTab()
             self_->ui->resetThemeFileButton->setEnabled(themeFileEnabled);
          });
 
+   theme_.SetSettingsVariable(generalSettings.theme());
+   SCWX_SETTINGS_COMBO_BOX(theme_,
+                           self_->ui->themeComboBox,
+                           types::UiStyleIterator(),
+                           types::GetUiStyleName);
+   theme_.SetResetButton(self_->ui->resetThemeButton);
+
    themeFile_.SetSettingsVariable(generalSettings.theme_file());
    themeFile_.SetEditWidget(self_->ui->themeFileLineEdit);
    themeFile_.SetResetButton(self_->ui->resetThemeFileButton);