diff --git a/ChangeLog b/ChangeLog
index eaeb429ea9..07b70057b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_stop_reorder): Prevent
+	a crash with hidden, reorderable tabs.  (#513230, 
+	Mike Massonnet, patch by Carlos Garnacho)
+
 2008-02-15  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkuimanager.c (gtk_ui_manager_insert_action_group):
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 4fde43f85d..2a9d84ac3b 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2753,7 +2753,7 @@ gtk_notebook_stop_reorder (GtkNotebook *notebook)
   else
     page = notebook->cur_page;
 
-  if (!page)
+  if (!page || !page->tab_label)
     return;
 
   priv->pressed_button = -1;