diff --git a/src/gtk/spinbutt.cpp b/src/gtk/spinbutt.cpp
index 1040ea1e28..38ea718bf0 100644
--- a/src/gtk/spinbutt.cpp
+++ b/src/gtk/spinbutt.cpp
@@ -92,6 +92,10 @@ bool wxSpinButton::Create(wxWindow *parent,
     g_object_ref(m_widget);
 
     gtk_entry_set_width_chars(GTK_ENTRY(m_widget), 0);
+#if GTK_CHECK_VERSION(3,12,0)
+    if (gtk_check_version(3,12,0) == NULL)
+        gtk_entry_set_max_width_chars(GTK_ENTRY(m_widget), 0);
+#endif
     gtk_spin_button_set_wrap( GTK_SPIN_BUTTON(m_widget),
                               (int)(m_windowStyle & wxSP_WRAP) );