diff --git a/ChangeLog b/ChangeLog
index 99390ed709..e5169b767f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-07  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	* gtk/gtkassistant.c (remove_page): Be more robust when removing
+	the current page.  (#499951, Andreas Sandberg)
+	
 2007-01-06  Johan Dahlin  <johan@gnome.org>
 
 	Merged from trunk:
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 90c6f2a075..14fa31aff3 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -869,6 +869,9 @@ remove_page (GtkAssistant *assistant,
 	  while (page_node && !GTK_WIDGET_VISIBLE (((GtkAssistantPage *) page_node->data)->page))
 	    page_node = page_node->next;
 
+          if (page_node == element)
+            page_node = page_node->next;
+
 	  if (page_node)
 	    priv->current_page = page_node->data;
 	  else