diff --git a/samples/widgets/spinbtn.cpp b/samples/widgets/spinbtn.cpp
index 2d371e8103..59b2c3b6c7 100644
--- a/samples/widgets/spinbtn.cpp
+++ b/samples/widgets/spinbtn.cpp
@@ -458,23 +458,12 @@ void SpinBtnWidgetsPage::OnButtonSetMinAndMax(wxCommandEvent& WXUNUSED(event))
 
     m_min = minNew;
     m_max = maxNew;
-    wxString smax('9', m_textMax->GetValue().length());
-    wxSize
-      size = m_spinctrl->GetSizeFromTextSize(m_spinctrl->GetTextExtent(smax));
-
-    m_spinctrl->SetMinSize(size);
-    m_spinctrl->SetSize(size);
-
-    smax += ".0";
-    size = m_spinctrldbl->GetSizeFromTextSize(
-                m_spinctrldbl->GetTextExtent(smax)
-            );
-    m_spinctrldbl->SetMinSize(size);
-    m_spinctrldbl->SetSize(size);
 
     m_spinbtn->SetRange(minNew, maxNew);
     m_spinctrl->SetRange(minNew, maxNew);
     m_spinctrldbl->SetRange(minNew, maxNew);
+
+    m_sizerSpin->Layout();
 }
 
 void SpinBtnWidgetsPage::OnButtonSetBase(wxCommandEvent& WXUNUSED(event))