diff --git a/ChangeLog b/ChangeLog
index ab50b55d58..57190bed72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-30  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkmain.c (gtk_grab_notify_foreach): Don't skip internal
+	children when emitting grab-notify.  (#343425, Markku Vire)
+
 	* gdk/gdkpixmap.c: 
 	* gdk/gdkwindow.c: Don't use G_DEFINE_TYPE, since the instance
 	struct name does not match the type name.  (#343453, Ed Catmur)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ab50b55d58..57190bed72 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2006-05-30  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtkmain.c (gtk_grab_notify_foreach): Don't skip internal
+	children when emitting grab-notify.  (#343425, Markku Vire)
+
 	* gdk/gdkpixmap.c: 
 	* gdk/gdkwindow.c: Don't use G_DEFINE_TYPE, since the instance
 	struct name does not match the type name.  (#343453, Ed Catmur)
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index a511ae7115..8f2be6b798 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1524,7 +1524,7 @@ gtk_grab_notify_foreach (GtkWidget *child,
     _gtk_widget_grab_notify (child, was_shadowed);
   
   if ((was_shadowed || is_shadowed) && GTK_IS_CONTAINER (child))
-    gtk_container_foreach (GTK_CONTAINER (child), gtk_grab_notify_foreach, info);
+    gtk_container_forall (GTK_CONTAINER (child), gtk_grab_notify_foreach, info);
       
   g_object_unref (child);