diff --git a/gtk/gtkpasswordentry.c b/gtk/gtkpasswordentry.c
index 16a811a8b3..78f12b0d62 100644
--- a/gtk/gtkpasswordentry.c
+++ b/gtk/gtkpasswordentry.c
@@ -90,6 +90,8 @@ gtk_password_entry_init (GtkPasswordEntry *entry)
   gtk_widget_set_has_surface (GTK_WIDGET (entry), FALSE);
 
   priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_widget_set_hexpand (priv->box, FALSE);
+  gtk_widget_set_vexpand (priv->box, FALSE);
   gtk_widget_set_parent (priv->box, GTK_WIDGET (entry));
 
   priv->entry = gtk_text_new ();
diff --git a/gtk/gtksearchentry.c b/gtk/gtksearchentry.c
index 188ede1d9f..a227956e93 100644
--- a/gtk/gtksearchentry.c
+++ b/gtk/gtksearchentry.c
@@ -506,6 +506,8 @@ gtk_search_entry_init (GtkSearchEntry *entry)
 
   priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_parent (priv->box, GTK_WIDGET (entry));
+  gtk_widget_set_hexpand (priv->box, FALSE);
+  gtk_widget_set_vexpand (priv->box, FALSE);
 
   priv->entry = gtk_text_new ();
   gtk_widget_set_hexpand (priv->entry, TRUE);