diff --git a/ChangeLog b/ChangeLog
index 602e73aecb..876335ff34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-10  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtktooltip.c (child_location_foreach): ignore invisible
+	(!drawable) widgets.  (Fixes bug reported by Paolo Borelli).
+
 2007-07-10  Matthias Clasen  <mclasen@redhat.com>
 
 	* README.in: Make sure all deprecations are mentioned.
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 0b5093f192..045f9b182d 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -414,6 +414,10 @@ child_location_foreach (GtkWidget *child,
   gint x, y;
   struct ChildLocation *child_loc = data;
 
+  /* Ignore invisible widgets */
+  if (!GTK_WIDGET_DRAWABLE (child))
+    return;
+
   if (!child_loc->child &&
       gtk_widget_translate_coordinates (child_loc->container, child,
 					child_loc->x, child_loc->y,