diff --git a/src/glade/editperson.glade b/src/glade/editperson.glade
index 8ff9fc79a..82b55d91b 100644
--- a/src/glade/editperson.glade
+++ b/src/glade/editperson.glade
@@ -57,6 +57,7 @@
                         <property name="right_attach">6</property>
                         <property name="top_attach">1</property>
                         <property name="bottom_attach">2</property>
+                        <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
                         <property name="y_options"></property>
                         <property name="y_padding">3</property>
                       </packing>
@@ -282,6 +283,7 @@
                     </child>
                     <child>
                       <object class="UndoableEntry" id="surname">
+                        <property name="width_request">150</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="tooltip_text" translatable="yes">Part of a person's name indicating the family to which the person belongs</property>
@@ -292,7 +294,7 @@
                         <property name="right_attach">6</property>
                         <property name="top_attach">3</property>
                         <property name="bottom_attach">4</property>
-                        <property name="x_options">GTK_FILL</property>
+                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
@@ -316,6 +318,7 @@
                     </child>
                     <child>
                       <object class="GtkComboBoxEntry" id="ntype">
+                        <property name="width_request">100</property>
                         <property name="visible">True</property>
                         <property name="tooltip_text" translatable="yes">An identification of what type of Name this is, eg. Birth Name, Married Name.</property>
                       </object>
@@ -324,6 +327,7 @@
                         <property name="right_attach">6</property>
                         <property name="top_attach">2</property>
                         <property name="bottom_attach">3</property>
+                        <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
@@ -447,6 +451,7 @@
                         <property name="right_attach">8</property>
                         <property name="top_attach">3</property>
                         <property name="bottom_attach">4</property>
+                        <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
                         <property name="y_options"></property>
                       </packing>
                     </child>
@@ -463,7 +468,7 @@
                         <property name="right_attach">2</property>
                         <property name="top_attach">3</property>
                         <property name="bottom_attach">4</property>
-                        <property name="x_options">GTK_FILL</property>
+                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
                         <property name="y_options"></property>
                         <property name="x_padding">6</property>
                       </packing>