diff --git a/ChangeLog b/ChangeLog
index cb7497b396..6f8e4e1eb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-26  Michael Natterer  <mitch@gimp.org>
+
+	* app/widgets/gimpscalebutton.c (gimp_scale_button_init): hide the
+	popup's plus and minus buttons, they are completely pointless.
+
 2008-06-25  Michael Natterer  <mitch@gimp.org>
 
 	* app/widgets/gimpsettingsbox.c: make sure the file dialog goes
diff --git a/app/widgets/gimpscalebutton.c b/app/widgets/gimpscalebutton.c
index 414a82dc39..461fbeb7fb 100644
--- a/app/widgets/gimpscalebutton.c
+++ b/app/widgets/gimpscalebutton.c
@@ -54,6 +54,12 @@ gimp_scale_button_init (GimpScaleButton *button)
 {
   GtkWidget *image = gtk_bin_get_child (GTK_BIN (button));
 
+  gtk_widget_hide (GTK_SCALE_BUTTON (button)->plus_button);
+  gtk_widget_set_no_show_all (GTK_SCALE_BUTTON (button)->plus_button, TRUE);
+
+  gtk_widget_hide (GTK_SCALE_BUTTON (button)->minus_button);
+  gtk_widget_set_no_show_all (GTK_SCALE_BUTTON (button)->minus_button, TRUE);
+
   g_signal_connect (image, "expose-event",
                     G_CALLBACK (gimp_scale_button_image_expose),
                     button);