diff --git a/ChangeLog b/ChangeLog
index 0531f9520..f3fdacf53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_stop_reorder): Unset
+	the during_reorder flag.  (#348049, Sven Herzberg, patch
+	by Benjamin Otte)
+
 2006-07-20  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkmenu.c (gtk_menu_destroy): Just remove the scroll
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0531f9520..f3fdacf53 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-07-21  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_stop_reorder): Unset
+	the during_reorder flag.  (#348049, Sven Herzberg, patch
+	by Benjamin Otte)
+
 2006-07-20  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkmenu.c (gtk_menu_destroy): Just remove the scroll
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 9ecd0806b..9cd57ccfd 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2611,6 +2611,7 @@ gtk_notebook_stop_reorder (GtkNotebook *notebook)
 			   page->child, page_num);
 
 	  priv->has_scrolled = FALSE;
+          priv->during_reorder = FALSE; 
 	}
 
       hide_drag_window (notebook, priv, page);