diff --git a/ChangeLog b/ChangeLog
index 2edef03d8d..f6b66b97be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 10 09:37:50 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkaccellabel.c (gtk_accel_label_accelerator_width): only take the
+ 	padding into account if there is an accelerator.
+
 Fri Jul 10 05:51:44 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkcontainer.c:
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2edef03d8d..f6b66b97be 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Fri Jul 10 09:37:50 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkaccellabel.c (gtk_accel_label_accelerator_width): only take the
+ 	padding into account if there is an accelerator.
+
 Fri Jul 10 05:51:44 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkcontainer.c:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2edef03d8d..f6b66b97be 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Jul 10 09:37:50 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkaccellabel.c (gtk_accel_label_accelerator_width): only take the
+ 	padding into account if there is an accelerator.
+
 Fri Jul 10 05:51:44 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkcontainer.c:
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2edef03d8d..f6b66b97be 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Fri Jul 10 09:37:50 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkaccellabel.c (gtk_accel_label_accelerator_width): only take the
+ 	padding into account if there is an accelerator.
+
 Fri Jul 10 05:51:44 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkcontainer.c:
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2edef03d8d..f6b66b97be 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Jul 10 09:37:50 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkaccellabel.c (gtk_accel_label_accelerator_width): only take the
+ 	padding into account if there is an accelerator.
+
 Fri Jul 10 05:51:44 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkcontainer.c:
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2edef03d8d..f6b66b97be 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Jul 10 09:37:50 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkaccellabel.c (gtk_accel_label_accelerator_width): only take the
+ 	padding into account if there is an accelerator.
+
 Fri Jul 10 05:51:44 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkcontainer.c:
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2edef03d8d..f6b66b97be 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Jul 10 09:37:50 1998  Tim Janik  <timj@gtk.org>
+
+	* gtk/gtkaccellabel.c (gtk_accel_label_accelerator_width): only take the
+ 	padding into account if there is an accelerator.
+
 Fri Jul 10 05:51:44 1998  Tim Janik  <timj@gtk.org>
 
 	* gtk/gtkcontainer.c:
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index 2e081c1c03..53045f1709 100644
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -211,7 +211,8 @@ gtk_accel_label_accelerator_width (GtkAccelLabel *accel_label)
   g_return_val_if_fail (accel_label != NULL, 0);
   g_return_val_if_fail (GTK_IS_ACCEL_LABEL (accel_label), 0);
   
-  return accel_label->accel_padding + accel_label->accel_string_width;
+  return (accel_label->accel_string_width +
+	  (accel_label->accel_string_width ? accel_label->accel_padding : 0));
 }
 
 static void