diff --git a/ChangeLog b/ChangeLog
index c64bda2bdf..f48485d4de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-12-10  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	* gtk/gtknotebook.c (gtk_notebook_real_remove): Another fix
+	to avoid further fallout from the fix for bug 388321.
+
 2007-12-07  Matthias Clasen  <mclasen@redhat.com>
 
 	Merged from trunk:
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index f1e6bc3a72..1d086932c1 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -4349,12 +4349,15 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
   gtk_widget_unparent (page->child);
 
   tab_label = page->tab_label;
-  g_object_ref (tab_label);
-  gtk_notebook_remove_tab_label (notebook, page);
-  if (destroying)
-    gtk_widget_destroy (tab_label);
-  g_object_unref (tab_label);
-  
+  if (tab_label)
+    {
+      g_object_ref (tab_label);
+      gtk_notebook_remove_tab_label (notebook, page);
+      if (destroying)
+        gtk_widget_destroy (tab_label);
+      g_object_unref (tab_label);
+    }
+
   if (notebook->menu)
     {
       gtk_container_remove (GTK_CONTAINER (notebook->menu),