diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 71498d9071..464ca93c01 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -870,6 +870,8 @@ gtk_spin_button_init (GtkSpinButton *spin_button)
   priv->entry = gtk_entry_new ();
   gtk_entry_set_width_chars (GTK_ENTRY (priv->entry), 0);
   gtk_entry_set_max_width_chars (GTK_ENTRY (priv->entry), 0);
+  gtk_widget_set_hexpand (priv->entry, TRUE);
+  gtk_widget_set_vexpand (priv->entry, TRUE);
   g_signal_connect (priv->entry, "activate", G_CALLBACK (gtk_spin_button_activate), spin_button);
   gtk_container_add (GTK_CONTAINER (priv->box), priv->entry);