diff --git a/ChangeLog b/ChangeLog
index 3f7afa262b..0bb803e93f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 15 14:56:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_size_allocate): 
+	Show/hide the notebook event window as necessary,
+	we weren't previously keeping the visibility updated
+	properly.  (#103599)
+
 2002-12-29  Murray Cumming  <murrayc@usa.net>
 
 	Fixes #102168. Merge from HEAD.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3f7afa262b..0bb803e93f 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Wed Jan 15 14:56:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_size_allocate): 
+	Show/hide the notebook event window as necessary,
+	we weren't previously keeping the visibility updated
+	properly.  (#103599)
+
 2002-12-29  Murray Cumming  <murrayc@usa.net>
 
 	Fixes #102168. Merge from HEAD.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3f7afa262b..0bb803e93f 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Wed Jan 15 14:56:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_size_allocate): 
+	Show/hide the notebook event window as necessary,
+	we weren't previously keeping the visibility updated
+	properly.  (#103599)
+
 2002-12-29  Murray Cumming  <murrayc@usa.net>
 
 	Fixes #102168. Merge from HEAD.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3f7afa262b..0bb803e93f 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Wed Jan 15 14:56:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_size_allocate): 
+	Show/hide the notebook event window as necessary,
+	we weren't previously keeping the visibility updated
+	properly.  (#103599)
+
 2002-12-29  Murray Cumming  <murrayc@usa.net>
 
 	Fixes #102168. Merge from HEAD.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3f7afa262b..0bb803e93f 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Wed Jan 15 14:56:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_size_allocate): 
+	Show/hide the notebook event window as necessary,
+	we weren't previously keeping the visibility updated
+	properly.  (#103599)
+
 2002-12-29  Murray Cumming  <murrayc@usa.net>
 
 	Fixes #102168. Merge from HEAD.
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 736ad65580..b024d0b169 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1309,9 +1309,14 @@ gtk_notebook_size_allocate (GtkWidget     *widget,
       GdkRectangle position;
 
       if (gtk_notebook_get_event_window_position (notebook, &position))
-	gdk_window_move_resize (notebook->event_window,
-				position.x, position.y,
-				position.width, position.height);
+	{
+	  gdk_window_move_resize (notebook->event_window,
+				  position.x, position.y,
+				  position.width, position.height);
+	  gdk_window_show_unraised (notebook->event_window);
+	}
+      else
+	gdk_window_hide (notebook->event_window);
     }
 
   if (notebook->children)
@@ -2413,10 +2418,6 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
   
   g_free (page);
 
-  if (!notebook->children && notebook->show_tabs &&
-      GTK_WIDGET_MAPPED (notebook))
-    gdk_window_hide (notebook->event_window);
-
   gtk_notebook_update_labels (notebook);
   if (need_resize)
     gtk_widget_queue_resize (GTK_WIDGET (notebook));
@@ -4098,9 +4099,6 @@ gtk_notebook_insert_page_menu (GtkNotebook *notebook,
 			G_CALLBACK (gtk_notebook_mnemonic_activate_switch_page),
 			notebook);
 
-  if (notebook->show_tabs && GTK_WIDGET_MAPPED (notebook))
-    gdk_window_show_unraised (notebook->event_window);
-
   gtk_widget_child_notify (child, "tab_expand");
   gtk_widget_child_notify (child, "tab_fill");
   gtk_widget_child_notify (child, "tab_pack");