diff --git a/ChangeLog b/ChangeLog
index 75f146298a..0b03d44a98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-29  Carlos Garnacho  <carlosg@gnome.org>
+
+	* gtk/gtknotebook.c (gtk_notebook_scroll): return if the widget that
+	originally received the event is a notebook page. (#315440, reported
+	by Mateusz Stefek)
+
 2006-12-28  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkuimanager.c (update_node): Only use the results
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index e4b0eb66e4..aa114e4cee 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2274,7 +2274,7 @@ gtk_notebook_scroll (GtkWidget      *widget,
   originator = gtk_get_event_widget ((GdkEvent *)event);
 
   /* ignore scroll events from the content of the page */
-  if (!originator || gtk_widget_is_ancestor (originator, child))
+  if (!originator || gtk_widget_is_ancestor (originator, child) || originator == child)
     return FALSE;
   
   switch (event->direction)