diff --git a/ChangeLog b/ChangeLog
index faf9a8b528..5471420482 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-28  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtkwidget.c (gtk_widget_set_tooltip_window): don't unref
+	tooltip_window, since this is handled by set_qdata_full() already.
+	(#412001, Torsten Schoenfeld).
+
 2007-03-27  Tor Lillqvist  <tml@novell.com>
 
 	* modules/input/Makefile.am: Use LDADDS for im-multipress.la, too: 
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 7de240de12..2d5c6add3e 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -8481,9 +8481,6 @@ gtk_widget_set_tooltip_window (GtkWidget *widget,
   if (custom_window)
     g_object_ref (custom_window);
 
-  if (tooltip_window)
-    g_object_unref (tooltip_window);
-
   tooltip_window = custom_window;
   g_object_set_qdata_full (G_OBJECT (widget), quark_tooltip_window,
 			   tooltip_window, g_object_unref);