diff --git a/src/menus/EditMenus.cpp b/src/menus/EditMenus.cpp
index ab9f86b03..20dad1d76 100644
--- a/src/menus/EditMenus.cpp
+++ b/src/menus/EditMenus.cpp
@@ -22,8 +22,6 @@
 #include "../commands/ScreenshotCommand.h"
 #include "../export/Export.h"
 #include "../prefs/PrefsDialog.h"
-#include "../prefs/SpectrogramSettings.h"
-#include "../prefs/WaveformSettings.h"
 #include "../tracks/labeltrack/ui/LabelTrackView.h"
 #include "../widgets/AudacityMessageBox.h"
 
diff --git a/src/prefs/PrefsDialog.cpp b/src/prefs/PrefsDialog.cpp
index 19a323f4d..16ef57835 100644
--- a/src/prefs/PrefsDialog.cpp
+++ b/src/prefs/PrefsDialog.cpp
@@ -62,7 +62,6 @@
 #include "TracksBehaviorsPrefs.h"
 #include "WarningsPrefs.h"
 // #include "WaveformPrefs.h"
-#include "WaveformSettings.h"
 #include "ExtImportPrefs.h"
 
 #ifdef EXPERIMENTAL_MIDI_OUT
@@ -857,9 +856,6 @@ void PrefsDialog::OnOK(wxCommandEvent & WXUNUSED(event))
 
    wxTheApp->AddPendingEvent(wxCommandEvent{ EVT_PREFS_UPDATE });
 
-   WaveformSettings::defaults().LoadPrefs();
-   SpectrogramSettings::defaults().LoadPrefs();
-
    if( IsModal() )
       EndModal(true);
    else
@@ -949,9 +945,6 @@ wxString PrefsPanel::HelpPageName()
 void DoReloadPreferences( AudacityProject &project )
 {
    {
-      SpectrogramSettings::defaults().LoadPrefs();
-      WaveformSettings::defaults().LoadPrefs();
-
       GlobalPrefsDialog dialog(
          &GetProjectFrame( project ) /* parent */, &project );
       wxCommandEvent Evt;
diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp
index 68588807f..5fe2dae89 100644
--- a/src/prefs/SpectrumPrefs.cpp
+++ b/src/prefs/SpectrumPrefs.cpp
@@ -501,10 +501,11 @@ bool SpectrumPrefs::Commit()
 
    mCommitted = true;
    SpectrogramSettings::Globals::Get().SavePrefs(); // always
+   SpectrogramSettings *const pSettings = &SpectrogramSettings::defaults();
    if (!mWt || mDefaulted) {
-      SpectrogramSettings *const pSettings = &SpectrogramSettings::defaults();
       pSettings->SavePrefs();
    }
+   pSettings->LoadPrefs(); // always; in case Globals changed
 
    return true;
 }
diff --git a/src/prefs/WaveformPrefs.cpp b/src/prefs/WaveformPrefs.cpp
index 721ff7baf..c2099a5de 100644
--- a/src/prefs/WaveformPrefs.cpp
+++ b/src/prefs/WaveformPrefs.cpp
@@ -177,12 +177,12 @@ bool WaveformPrefs::Commit()
       }
    }
 
+   WaveformSettings *const pSettings = &WaveformSettings::defaults();
    if (!mWt || mDefaulted) {
-      WaveformSettings *const pSettings =
-         &WaveformSettings::defaults();
       *pSettings = mTempSettings;
       pSettings->SavePrefs();
    }
+   pSettings->LoadPrefs(); // always; in case Globals changed
 
    mTempSettings.ConvertToEnumeratedDBRange();