diff --git a/src/effects/BassTreble.cpp b/src/effects/BassTreble.cpp
index e524e7f90..5f6801ad0 100644
--- a/src/effects/BassTreble.cpp
+++ b/src/effects/BassTreble.cpp
@@ -267,55 +267,44 @@ void EffectBassTreble::PopulateOrExchange(ShuttleGui & S)
 {
    S.StartVerticalLay(0);
    {
-      S.StartStatic(wxT(""));
+      S.StartMultiColumn(3, wxEXPAND);
+      S.SetStretchyCol(2);
       {
-         S.StartMultiColumn(3, wxEXPAND);
-         S.SetStretchyCol(2);
-         {
-            #ifdef __WXGTK__
-            // BoxSizer is to make first mnemonic work, on Linux.
-            wxPanel* cPanel = new wxPanel(S.GetParent(), wxID_ANY);
-            wxBoxSizer* cSizer = new wxBoxSizer(wxVERTICAL);
-            cPanel->SetSizer(cSizer);
-            #endif
+         // Bass control
+         FloatingPointValidator<double> vldBass(1, &dB_bass);
+         vldBass.SetRange(MIN_Bass, MAX_Bass);
+         mBassT = S.Id(ID_Bass).AddTextBox(_("&Bass (dB):"), wxT(""), 10);
+         mBassT->SetName(_("Bass (dB):"));
+         mBassT->SetValidator(vldBass);
 
-            // Bass control
-            FloatingPointValidator<double> vldBass(1, &dB_bass);
-            vldBass.SetRange(MIN_Bass, MAX_Bass);
-            mBassT = S.Id(ID_Bass).AddTextBox(_("&Bass (dB):"), wxT(""), 10);
-            mBassT->SetName(_("Bass (dB):"));
-            mBassT->SetValidator(vldBass);
+         S.SetStyle(wxSL_HORIZONTAL);
+         mBassS = S.Id(ID_Bass).AddSlider(wxT(""), 0, MAX_Bass * kSliderScale, MIN_Bass * kSliderScale);
+         mBassS->SetName(_("Bass"));
+         mBassS->SetPageSize(30);
 
-            S.SetStyle(wxSL_HORIZONTAL);
-            mBassS = S.Id(ID_Bass).AddSlider(wxT(""), 0, MAX_Bass * kSliderScale, MIN_Bass * kSliderScale);
-            mBassS->SetName(_("Bass"));
-            mBassS->SetPageSize(30);
+         // Treble control
+         FloatingPointValidator<double> vldTreble(1, &dB_treble);
+         vldTreble.SetRange(MIN_Treble, MAX_Treble);
+         mTrebleT = S.Id(ID_Treble).AddTextBox(_("&Treble (dB):"), wxT(""), 10);
+         mTrebleT->SetValidator(vldTreble);
 
-            // Treble control
-            FloatingPointValidator<double> vldTreble(1, &dB_treble);
-            vldTreble.SetRange(MIN_Treble, MAX_Treble);
-            mTrebleT = S.Id(ID_Treble).AddTextBox(_("&Treble (dB):"), wxT(""), 10);
-            mTrebleT->SetValidator(vldTreble);
+         S.SetStyle(wxSL_HORIZONTAL);
+         mTrebleS = S.Id(ID_Treble).AddSlider(wxT(""), 0, MAX_Treble * kSliderScale, MIN_Treble * kSliderScale);
+         mTrebleS->SetName(_("Treble"));
+         mTrebleS->SetPageSize(30);
 
-            S.SetStyle(wxSL_HORIZONTAL);
-            mTrebleS = S.Id(ID_Treble).AddSlider(wxT(""), 0, MAX_Treble * kSliderScale, MIN_Treble * kSliderScale);
-            mTrebleS->SetName(_("Treble"));
-            mTrebleS->SetPageSize(30);
+         // Level control
+         FloatingPointValidator<double> vldLevel(1, &dB_level);
+         vldLevel.SetRange(MIN_Level, MAX_Level);
+         mLevelT = S.Id(ID_Level).AddTextBox(_("&Level (dB):"), wxT(""), 10);
+         mLevelT->SetValidator(vldLevel);
 
-            // Level control
-            FloatingPointValidator<double> vldLevel(1, &dB_level);
-            vldLevel.SetRange(MIN_Level, MAX_Level);
-            mLevelT = S.Id(ID_Level).AddTextBox(_("&Level (dB):"), wxT(""), 10);
-            mLevelT->SetValidator(vldLevel);
-
-            S.SetStyle(wxSL_HORIZONTAL);
-            mLevelS = S.Id(ID_Level).AddSlider(wxT(""), 0, MAX_Level * kSliderScale, MIN_Level * kSliderScale);
-            mLevelS->SetName(_("Level"));
-            mLevelS->SetPageSize(30);
-         }
-         S.EndMultiColumn();
+         S.SetStyle(wxSL_HORIZONTAL);
+         mLevelS = S.Id(ID_Level).AddSlider(wxT(""), 0, MAX_Level * kSliderScale, MIN_Level * kSliderScale);
+         mLevelS->SetName(_("Level"));
+         mLevelS->SetPageSize(30);
       }
-      S.EndStatic();
+      S.EndMultiColumn();
 
       // Normalize checkbox
       S.StartHorizontalLay(wxLEFT, true);
diff --git a/src/effects/ClickRemoval.cpp b/src/effects/ClickRemoval.cpp
index 73943daef..0481c48d9 100644
--- a/src/effects/ClickRemoval.cpp
+++ b/src/effects/ClickRemoval.cpp
@@ -350,10 +350,7 @@ void EffectClickRemoval::PopulateOrExchange(ShuttleGui & S)
       mThreshS = S.Id(ID_Thresh).AddSlider(wxT(""), mThresholdLevel, MAX_Threshold, MIN_Threshold);
       mThreshS->SetName(_("Threshold"));
       mThreshS->SetValidator(wxGenericValidator(&mThresholdLevel));
-#if defined(__WXGTK__)
-      // Force a minimum size since wxGTK allows it to go to zero
-      mThreshS->SetMinSize(wxSize(100, -1));
-#endif
+      mThreshS->SetMinSize(wxSize(150, -1));
 
       // Click width
       IntegerValidator<int> vldWidth(&mClickWidth);
@@ -367,10 +364,7 @@ void EffectClickRemoval::PopulateOrExchange(ShuttleGui & S)
       mWidthS = S.Id(ID_Width).AddSlider(wxT(""), mClickWidth, MAX_Width, MIN_Width);
       mWidthS->SetName(_("Max Spike Width"));
       mWidthS->SetValidator(wxGenericValidator(&mClickWidth));
-#if defined(__WXGTK__)
-      // Force a minimum size since wxGTK allows it to go to zero
-      mWidthS->SetMinSize(wxSize(100, -1));
-#endif
+      mWidthS->SetMinSize(wxSize(150, -1));
    }
    S.EndMultiColumn();
 
diff --git a/src/effects/NoiseReduction.cpp b/src/effects/NoiseReduction.cpp
index 9081132af..3d7154808 100644
--- a/src/effects/NoiseReduction.cpp
+++ b/src/effects/NoiseReduction.cpp
@@ -1691,13 +1691,6 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
       S.AddVariableText(_(
          "Select all of the audio you want filtered, choose how much noise you want\nfiltered out, and then click 'OK' to reduce noise.\n"));
 
-#if defined(__WXGTK__)
-      // Put everything inside a panel to workaround a problem on Linux where the access key
-      // does not work if it is defined within static text on the first control.
-      S.SetStyle(wxTAB_TRAVERSAL);
-      S.StartPanel();
-#endif
-
       S.StartMultiColumn(3, wxEXPAND);
       S.SetStretchyCol(2);
       {
@@ -1733,10 +1726,6 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
 #endif
       }
       S.EndMultiColumn();
-
-#if defined(__WXGTK__)
-      S.EndPanel();
-#endif
    }
    S.EndStatic();
 
@@ -1744,13 +1733,6 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
 #ifdef ADVANCED_SETTINGS
    S.StartStatic(_("Advanced Settings"));
    {
-#if defined(__WXGTK__)
-      // Put everything inside a panel to workaround a problem on Linux where the access key
-      // does not work if it is defined within static text on the first control.
-      S.SetStyle(wxTAB_TRAVERSAL);
-      S.StartPanel();
-#endif
-
       S.StartMultiColumn(2);
       {
          {
@@ -1820,10 +1802,6 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
          }
       }
       S.EndMultiColumn();
-
-#if defined(__WXGTK__)
-      S.EndPanel();
-#endif
    }
    S.EndStatic();
 #endif