diff --git a/ChangeLog b/ChangeLog
index 3a39007d78..8f15b39377 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-05  Noah Levitt  <nlevitt@columbia.edu>
+
+	* gtk/gtknotebook.c (gtk_notebook_button_press): Ignore button
+	presses that are not on the tab (#114534).
+
 Thu Jun  5 20:35:40 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* demos/Makefile.am: Conditionalize dependencies for
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3a39007d78..8f15b39377 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-06-05  Noah Levitt  <nlevitt@columbia.edu>
+
+	* gtk/gtknotebook.c (gtk_notebook_button_press): Ignore button
+	presses that are not on the tab (#114534).
+
 Thu Jun  5 20:35:40 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* demos/Makefile.am: Conditionalize dependencies for
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3a39007d78..8f15b39377 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-06-05  Noah Levitt  <nlevitt@columbia.edu>
+
+	* gtk/gtknotebook.c (gtk_notebook_button_press): Ignore button
+	presses that are not on the tab (#114534).
+
 Thu Jun  5 20:35:40 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* demos/Makefile.am: Conditionalize dependencies for
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3a39007d78..8f15b39377 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-06-05  Noah Levitt  <nlevitt@columbia.edu>
+
+	* gtk/gtknotebook.c (gtk_notebook_button_press): Ignore button
+	presses that are not on the tab (#114534).
+
 Thu Jun  5 20:35:40 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* demos/Makefile.am: Conditionalize dependencies for
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3a39007d78..8f15b39377 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-06-05  Noah Levitt  <nlevitt@columbia.edu>
+
+	* gtk/gtknotebook.c (gtk_notebook_button_press): Ignore button
+	presses that are not on the tab (#114534).
+
 Thu Jun  5 20:35:40 2003  Owen Taylor  <otaylor@redhat.com>
 
 	* demos/Makefile.am: Conditionalize dependencies for
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 74031fcec1..249d958ce0 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1617,7 +1617,8 @@ gtk_notebook_button_press (GtkWidget      *widget,
   gint num;
   gint x, y;
 
-  if (event->type != GDK_BUTTON_PRESS || !notebook->children ||
+  if (event->window != notebook->event_window || 
+      event->type != GDK_BUTTON_PRESS || !notebook->children ||
       notebook->button)
     return FALSE;