diff --git a/src/ChangeLog b/src/ChangeLog
index d9f974cce5d..8ffc1c56675 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-02  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (create_dialog): Force min spacing 10 between buttons.
+	Don't add label between left and right buttons (Bug#18129).
+
 2014-08-01  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Make functions static that no longer need to be extern.
diff --git a/src/gtkutil.c b/src/gtkutil.c
index b18e5f325e1..7e7d68d80d4 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1541,6 +1541,7 @@ create_dialog (widget_value *wv,
           gtk_box_set_spacing (wvbox, req.height);
 	  if (item->value && strlen (item->value) > 0)
             button_spacing = 2*req.width/strlen (item->value);
+          if (button_spacing < 10) button_spacing = 10;
         }
       else
         {
@@ -1557,11 +1558,6 @@ create_dialog (widget_value *wv,
             {
               if (make_two_rows)
                 cur_box = GTK_BOX (whbox_down);
-              else
-                gtk_box_pack_start (cur_box,
-                                    gtk_label_new (""),
-                                    TRUE, TRUE,
-                                    button_spacing);
             }
         }