diff --git a/ChangeLog b/ChangeLog
index 7deb8a78ac..8695357e89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-29  Sven Neumann  <sven@gimp.org>
+
+	* app/display/gimpscalecombobox.c (gimp_scale_combo_box_init):
+	unset the entry's frame instead of reducing the inner border.
+
 2008-05-29  Sven Neumann  <sven@gimp.org>
 
 	* themes/Default/images/Makefile.am (STOCK_TOOL_IMAGES): 
diff --git a/app/display/gimpscalecombobox.c b/app/display/gimpscalecombobox.c
index ed3cec0e47..20b20cf917 100644
--- a/app/display/gimpscalecombobox.c
+++ b/app/display/gimpscalecombobox.c
@@ -117,7 +117,6 @@ gimp_scale_combo_box_init (GimpScaleComboBox *combo_box)
   GtkCellLayout   *layout;
   GtkCellRenderer *cell;
   GtkTreeIter      iter;
-  GtkBorder        border = { 0, 0, 0, 0 };
   gint             i;
 
   combo_box->scale     = 1.0;
@@ -139,7 +138,7 @@ gimp_scale_combo_box_init (GimpScaleComboBox *combo_box)
                 "xalign",             1.0,
                 "width-chars",        7,
                 "truncate-multiline", TRUE,
-                "inner-border",       &border,
+                "has-frame",          FALSE,
                 NULL);
 
   layout = GTK_CELL_LAYOUT (combo_box);