diff --git a/ChangeLog b/ChangeLog
index e8bdeeffc4..8694cfaa0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-25  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktooltip.c (_gtk_tooltip_handle_event): Call
+	gtk_tooltip_hide_tooltip() even if the tooltip is not
+	visible yet. This fixes annoying dangling tooltips
+	on systray icons.  
+
 2007-07-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkiconcachevalidator.c: Silence the validator.
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 2d60b7c65d..77d465ca90 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -1118,7 +1118,7 @@ _gtk_tooltip_handle_event (GdkEvent *event)
   /* Hide the tooltip when there's no new tooltip widget */
   if (!has_tooltip_widget)
     {
-      if (current_tooltip && GTK_TOOLTIP_VISIBLE (current_tooltip))
+      if (current_tooltip)
 	gtk_tooltip_hide_tooltip (current_tooltip);
 
       return;