diff --git a/ChangeLog b/ChangeLog
index 89983c3cbf..a8e8c9acad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-08 Matthias Clasen <mclasen@redhat.com>
+
+	* gtk/gtknotebook.c (gtk_notebook_reorder_tab): Only
+	reorder tabs if the focus is in the tab.  (#350342, Carlos
+	Garnacho Parro)
+
 2006-10-08 Michael Emmel <mike.emmel@gmail.com>
 
 	* gdk/directfb/gdkproperty-directfb.c strdup atom name (#357611) 
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index d5a9b8a592..240d4bb8f3 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1231,6 +1231,9 @@ gtk_notebook_reorder_tab (GtkNotebook      *notebook,
   GList *last, *child;
   gint page_num;
 
+  if (!gtk_widget_is_focus (GTK_WIDGET (notebook)))
+    return;
+
   if (!notebook->cur_page ||
       !notebook->cur_page->reorderable)
     return;