diff --git a/src/toolbars/SpectralSelectionBar.cpp b/src/toolbars/SpectralSelectionBar.cpp
index e9a69ab10..5123b4349 100644
--- a/src/toolbars/SpectralSelectionBar.cpp
+++ b/src/toolbars/SpectralSelectionBar.cpp
@@ -343,7 +343,12 @@ void SpectralSelectionBar::OnChoice(wxCommandEvent &)
    mHighCtrl->Show(!mbCenterAndWidth);
 
    ValuesToControls();
-   GetSizer()->Layout();   // Required so that the layout does not mess up on Windows when changing the format.
+
+   wxSize sz = GetMinSize();
+   sz.SetWidth(wxDefaultCoord);
+   SetMinSize(sz);
+   Layout();
+   Fit();
    Updated();
 }