diff --git a/ChangeLog b/ChangeLog
index 93aab6ee8f..686e4e9f14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-27  Matthias Clasen  <mclasen@redhat.com>
+	
+	* gtk/gtktogglebutton.c: Don't chain the clicked handler
+	up unconditionally.
+
 2009-01-27  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 88f22fbf0c..de6bb053e2 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -502,7 +502,8 @@ gtk_toggle_button_clicked (GtkButton *button)
 
   g_object_notify (G_OBJECT (toggle_button), "active");
 
-  GTK_BUTTON_CLASS (gtk_toggle_button_parent_class)->clicked (button);
+  if (GTK_BUTTON_CLASS (gtk_toggle_button_parent_class)->clicked)
+    GTK_BUTTON_CLASS (gtk_toggle_button_parent_class)->clicked (button);
 }
 
 static void