diff --git a/src/prefs/BatchPrefs.cpp b/src/prefs/BatchPrefs.cpp
index 9d05f2e4d..839afcafe 100644
--- a/src/prefs/BatchPrefs.cpp
+++ b/src/prefs/BatchPrefs.cpp
@@ -53,8 +53,10 @@ void BatchPrefs::Populate( )
 /// Defines the dialog and does data exchange with it.
 void BatchPrefs::PopulateOrExchange( ShuttleGui & S )
 {
-   S.StartHorizontalLay( wxEXPAND, 0 );
    S.SetBorder( 2 );
+   S.StartScroller();
+   S.StartHorizontalLay( wxEXPAND, 0 );
+
    S.StartStatic( _("Behaviors"),1 );
    {
 #ifdef __WXDEBUG__
@@ -64,7 +66,7 @@ void BatchPrefs::PopulateOrExchange( ShuttleGui & S )
    }
    S.EndStatic();
    S.EndHorizontalLay();
-
+   S.EndScroller();
    return;
 }
 
diff --git a/src/prefs/DevicePrefs.cpp b/src/prefs/DevicePrefs.cpp
index 47f8f8871..af1b230c6 100644
--- a/src/prefs/DevicePrefs.cpp
+++ b/src/prefs/DevicePrefs.cpp
@@ -111,6 +111,7 @@ void DevicePrefs::PopulateOrExchange(ShuttleGui & S)
    wxArrayString empty;
 
    S.SetBorder(2);
+   S.StartScroller();
 
    S.StartStatic(_("Interface"));
    {
@@ -189,6 +190,7 @@ void DevicePrefs::PopulateOrExchange(ShuttleGui & S)
       S.EndThreeColumn();
    }
    S.EndStatic();
+   S.EndScroller();
 
 }
 
diff --git a/src/prefs/DirectoriesPrefs.cpp b/src/prefs/DirectoriesPrefs.cpp
index ab5151ce9..0f06204ee 100644
--- a/src/prefs/DirectoriesPrefs.cpp
+++ b/src/prefs/DirectoriesPrefs.cpp
@@ -79,6 +79,7 @@ void DirectoriesPrefs::Populate()
 void DirectoriesPrefs::PopulateOrExchange(ShuttleGui & S)
 {
    S.SetBorder(2);
+   S.StartScroller();
 
    S.StartStatic(_("Temporary files directory"));
    {
@@ -122,6 +123,8 @@ void DirectoriesPrefs::PopulateOrExchange(ShuttleGui & S)
    }
    S.EndStatic();
 #endif // DEPRECATED_AUDIO_CACHE
+   S.EndScroller();
+
 }
 
 void DirectoriesPrefs::OnChooseTempDir(wxCommandEvent & e)
diff --git a/src/prefs/EffectsPrefs.cpp b/src/prefs/EffectsPrefs.cpp
index 448e4c231..7a208baf8 100644
--- a/src/prefs/EffectsPrefs.cpp
+++ b/src/prefs/EffectsPrefs.cpp
@@ -56,8 +56,8 @@ void EffectsPrefs::Populate()
 void EffectsPrefs::PopulateOrExchange(ShuttleGui & S)
 {
    S.SetBorder(2);
-
    S.StartScroller();
+
    S.StartStatic(_("Enable Effects"));
    {
 
@@ -159,8 +159,8 @@ void EffectsPrefs::PopulateOrExchange(ShuttleGui & S)
                     true);
    }
    S.EndStatic();
-   S.EndScroller();
 #endif
+   S.EndScroller();
 }
 
 bool EffectsPrefs::Commit()
diff --git a/src/prefs/ExtImportPrefs.cpp b/src/prefs/ExtImportPrefs.cpp
index 2a9f0d7ed..80bede526 100644
--- a/src/prefs/ExtImportPrefs.cpp
+++ b/src/prefs/ExtImportPrefs.cpp
@@ -85,6 +85,7 @@ void ExtImportPrefs::Populate()
 void ExtImportPrefs::PopulateOrExchange(ShuttleGui & S)
 {
    S.SetBorder(2);
+   S.StartScroller();
 
    S.TieCheckBox(_("A&ttempt to use filter in OpenFile dialog first"),
          wxT("/ExtendedImport/OverrideExtendedImportByOpenFileDialogChoice"),
@@ -182,6 +183,8 @@ void ExtImportPrefs::PopulateOrExchange(ShuttleGui & S)
       S.EndHorizontalLay();
    }
    S.EndStatic();
+   S.EndScroller();
+
    Layout();
    Fit();
    SetMinSize(GetSize());
diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp
index 642fba702..891562ffa 100644
--- a/src/prefs/GUIPrefs.cpp
+++ b/src/prefs/GUIPrefs.cpp
@@ -123,8 +123,8 @@ void GUIPrefs::Populate()
 void GUIPrefs::PopulateOrExchange(ShuttleGui & S)
 {
    S.SetBorder(2);
-
    S.StartScroller();
+
    S.StartStatic(_("Display"));
    {
       S.StartMultiColumn(2);
diff --git a/src/prefs/ImportExportPrefs.cpp b/src/prefs/ImportExportPrefs.cpp
index 08d24ea3f..8a7d7d336 100644
--- a/src/prefs/ImportExportPrefs.cpp
+++ b/src/prefs/ImportExportPrefs.cpp
@@ -50,6 +50,7 @@ void ImportExportPrefs::Populate()
 void ImportExportPrefs::PopulateOrExchange(ShuttleGui & S)
 {
    S.SetBorder(2);
+   S.StartScroller();
 
    S.StartStatic(_("When importing audio files"));
    {
@@ -101,6 +102,7 @@ void ImportExportPrefs::PopulateOrExchange(ShuttleGui & S)
    }
    S.EndStatic();
 #endif
+   S.EndScroller();
 }
 
 bool ImportExportPrefs::Commit()
diff --git a/src/prefs/LibraryPrefs.cpp b/src/prefs/LibraryPrefs.cpp
index d3d37dd63..3b61da3b1 100644
--- a/src/prefs/LibraryPrefs.cpp
+++ b/src/prefs/LibraryPrefs.cpp
@@ -81,6 +81,8 @@ void LibraryPrefs::Populate()
 void LibraryPrefs::PopulateOrExchange(ShuttleGui & S)
 {
    S.SetBorder(2);
+   S.StartScroller();
+
    S.StartStatic(_("MP3 Export Library"));
    {
       S.StartTwoColumn();
@@ -161,6 +163,8 @@ void LibraryPrefs::PopulateOrExchange(ShuttleGui & S)
 #endif
    }
    S.EndStatic();
+   S.EndScroller();
+
 }
 
 /// Sets the a text area on the dialog to have the name
diff --git a/src/prefs/MidiIOPrefs.cpp b/src/prefs/MidiIOPrefs.cpp
index e5a5be376..891b61e4b 100644
--- a/src/prefs/MidiIOPrefs.cpp
+++ b/src/prefs/MidiIOPrefs.cpp
@@ -115,6 +115,7 @@ void MidiIOPrefs::PopulateOrExchange( ShuttleGui & S ) {
    wxArrayString empty;
 
    S.SetBorder(2);
+   S.StartScroller();
 
    S.StartStatic(_("Interface"));
    {
@@ -173,6 +174,8 @@ void MidiIOPrefs::PopulateOrExchange( ShuttleGui & S ) {
    }
    S.EndStatic();
 #endif
+   S.EndScroller();
+
 }
 
 void MidiIOPrefs::OnHost(wxCommandEvent & WXUNUSED(e))
diff --git a/src/prefs/ModulePrefs.cpp b/src/prefs/ModulePrefs.cpp
index 1d855a34a..a9b908d0f 100644
--- a/src/prefs/ModulePrefs.cpp
+++ b/src/prefs/ModulePrefs.cpp
@@ -101,7 +101,9 @@ void ModulePrefs::PopulateOrExchange(ShuttleGui & S)
    StatusChoices.Add( _("Ask" ) );
    StatusChoices.Add( _("Failed" ) );
    StatusChoices.Add( _("New" ) );
+
    S.SetBorder(2);
+   S.StartScroller();
 
    S.StartStatic( {} );
    {
@@ -110,7 +112,6 @@ void ModulePrefs::PopulateOrExchange(ShuttleGui & S)
       S.AddFixedText(wxString(wxT("  ")) + _("'Failed' means Audacity thinks the module is broken and won't run it.") );
       S.AddFixedText(wxString(wxT("  ")) + _("'New' means no choice has been made yet.") );
       S.AddFixedText(_("Changes to these settings only take effect when Audacity starts up."));
-      S.StartScroller();
       {
         S.StartMultiColumn( 2 );
         int i;
@@ -122,9 +123,9 @@ void ModulePrefs::PopulateOrExchange(ShuttleGui & S)
       {
         S.AddFixedText( _("No modules were found") );
       }
-      S.EndScroller();
    }
    S.EndStatic();
+   S.EndScroller();
 }
 
 bool ModulePrefs::Commit()
diff --git a/src/prefs/PlaybackPrefs.cpp b/src/prefs/PlaybackPrefs.cpp
index 7e4262562..1b215d230 100644
--- a/src/prefs/PlaybackPrefs.cpp
+++ b/src/prefs/PlaybackPrefs.cpp
@@ -53,6 +53,7 @@ void PlaybackPrefs::PopulateOrExchange(ShuttleGui & S)
 {
    wxTextCtrl *w;
 
+   S.StartScroller();
    S.SetBorder(2);
 
    S.StartStatic(_("Effects Preview"));
@@ -114,6 +115,8 @@ void PlaybackPrefs::PopulateOrExchange(ShuttleGui & S)
       S.EndThreeColumn();
    }
    S.EndStatic();
+   S.EndScroller();
+
 }
 
 bool PlaybackPrefs::Commit()
diff --git a/src/prefs/ProjectsPrefs.cpp b/src/prefs/ProjectsPrefs.cpp
index 00d503bb0..e38f9c7e8 100644
--- a/src/prefs/ProjectsPrefs.cpp
+++ b/src/prefs/ProjectsPrefs.cpp
@@ -56,6 +56,7 @@ void ProjectsPrefs::Populate()
 void ProjectsPrefs::PopulateOrExchange(ShuttleGui & S)
 {
    S.SetBorder(2);
+   S.StartScroller();
 
    S.StartStatic(_("When saving a project that depends on other audio files"));
    {
@@ -71,6 +72,8 @@ void ProjectsPrefs::PopulateOrExchange(ShuttleGui & S)
       S.EndRadioButtonGroup();
    }
    S.EndStatic();
+   S.EndScroller();
+
 }
 
 bool ProjectsPrefs::Commit()
diff --git a/src/prefs/QualityPrefs.cpp b/src/prefs/QualityPrefs.cpp
index 065944e25..08d28ab4f 100644
--- a/src/prefs/QualityPrefs.cpp
+++ b/src/prefs/QualityPrefs.cpp
@@ -118,6 +118,7 @@ void QualityPrefs::GetNamesAndLabels()
 void QualityPrefs::PopulateOrExchange(ShuttleGui & S)
 {
    S.SetBorder(2);
+   S.StartScroller();
 
    S.StartStatic(_("Sampling"));
    {
@@ -204,6 +205,8 @@ void QualityPrefs::PopulateOrExchange(ShuttleGui & S)
       S.EndMultiColumn();
    }
    S.EndStatic();
+   S.EndScroller();
+
 }
 
 /// Enables or disables the Edit box depending on
diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp
index 8f4a8722d..9ae602fc2 100644
--- a/src/prefs/RecordingPrefs.cpp
+++ b/src/prefs/RecordingPrefs.cpp
@@ -71,6 +71,7 @@ void RecordingPrefs::Populate()
 void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
 {
    S.SetBorder(2);
+   S.StartScroller();
 
    S.StartStatic(_("Playthrough"));
    {
@@ -220,6 +221,8 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
       }
       S.EndStatic();
    #endif
+   S.EndScroller();
+
 }
 
 bool RecordingPrefs::Commit()
diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp
index dc12a318e..47078ea78 100644
--- a/src/prefs/SpectrumPrefs.cpp
+++ b/src/prefs/SpectrumPrefs.cpp
@@ -158,13 +158,12 @@ void SpectrumPrefs::PopulatePaddingChoices(size_t windowSize)
 void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
 {
    mPopulating = true;
-
    S.SetBorder(2);
+   S.StartScroller(); {
 
    // S.StartStatic(_("Track Settings"));
    // {
 
-   S.StartScroller(); {
 
    mDefaultsCheckbox = 0;
    if (mWt) {
diff --git a/src/prefs/ThemePrefs.cpp b/src/prefs/ThemePrefs.cpp
index 629777bcd..48ff4d823 100644
--- a/src/prefs/ThemePrefs.cpp
+++ b/src/prefs/ThemePrefs.cpp
@@ -88,6 +88,7 @@ void ThemePrefs::Populate()
 void ThemePrefs::PopulateOrExchange(ShuttleGui & S)
 {
    S.SetBorder(2);
+   S.StartScroller();
 
    S.StartStatic(_("Info"));
    {
@@ -146,6 +147,8 @@ void ThemePrefs::PopulateOrExchange(ShuttleGui & S)
       S.EndHorizontalLay();
    }
    S.EndStatic();
+   S.EndScroller();
+
 }
 
 /// Load Theme from multiple png files.
diff --git a/src/prefs/TracksBehaviorsPrefs.cpp b/src/prefs/TracksBehaviorsPrefs.cpp
index ae9e213a7..62e9aff83 100644
--- a/src/prefs/TracksBehaviorsPrefs.cpp
+++ b/src/prefs/TracksBehaviorsPrefs.cpp
@@ -59,8 +59,8 @@ void TracksBehaviorsPrefs::Populate()
 void TracksBehaviorsPrefs::PopulateOrExchange(ShuttleGui & S)
 {
    S.SetBorder(2);
-
    S.StartScroller();
+
    S.StartStatic(_("Behaviors"));
    {
       S.TieCheckBox(_("A&uto-select, if selection required"),
diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp
index aada49310..e51ebfc9a 100644
--- a/src/prefs/TracksPrefs.cpp
+++ b/src/prefs/TracksPrefs.cpp
@@ -119,8 +119,8 @@ void TracksPrefs::Populate()
 void TracksPrefs::PopulateOrExchange(ShuttleGui & S)
 {
    S.SetBorder(2);
-
    S.StartScroller();
+
    S.StartStatic(_("Display"));
    {
       S.TieCheckBox(_("&Pinned Recording/Playback head"),
diff --git a/src/prefs/WarningsPrefs.cpp b/src/prefs/WarningsPrefs.cpp
index f9531b4ba..92bcb8f87 100644
--- a/src/prefs/WarningsPrefs.cpp
+++ b/src/prefs/WarningsPrefs.cpp
@@ -52,6 +52,7 @@ void WarningsPrefs::Populate()
 void WarningsPrefs::PopulateOrExchange(ShuttleGui & S)
 {
    S.SetBorder(2);
+   S.StartScroller();
 
    S.StartStatic(_("Show Warnings/Prompts for"));
    {
@@ -78,6 +79,8 @@ void WarningsPrefs::PopulateOrExchange(ShuttleGui & S)
                     true);
    }
    S.EndStatic();
+   S.EndScroller();
+
 }
 
 bool WarningsPrefs::Commit()
diff --git a/src/prefs/WaveformPrefs.cpp b/src/prefs/WaveformPrefs.cpp
index ab7aa2be2..8513866c6 100644
--- a/src/prefs/WaveformPrefs.cpp
+++ b/src/prefs/WaveformPrefs.cpp
@@ -76,6 +76,7 @@ void WaveformPrefs::PopulateOrExchange(ShuttleGui & S)
    mPopulating = true;
 
    S.SetBorder(2);
+   S.StartScroller();
 
    // S.StartStatic(_("Track Settings"));
    {
@@ -113,6 +114,8 @@ void WaveformPrefs::PopulateOrExchange(ShuttleGui & S)
    S.EndStatic();
    */
 
+   S.EndScroller();
+
    EnableDisableRange();
 
    mPopulating = false;