diff --git a/ChangeLog b/ChangeLog
index 665c16f3ce..d06e8aeb99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
 2005-04-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/testiconview.c: Add some more tests.
+
 	* gtk/gtkiconview.c (gtk_icon_view_select_path): Don't crash
 	if the path does not point to a row in the model.  (#300909,
 	Mathias Hasselmann)
+	(gtk_icon_view_rows_reordered): Re-layout here.  (#301009, 
+	Mathias Hasselmann)
 
 	* tests/testtext.c: Add some more attribute tests.
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 665c16f3ce..d06e8aeb99 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,8 +1,12 @@
 2005-04-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/testiconview.c: Add some more tests.
+
 	* gtk/gtkiconview.c (gtk_icon_view_select_path): Don't crash
 	if the path does not point to a row in the model.  (#300909,
 	Mathias Hasselmann)
+	(gtk_icon_view_rows_reordered): Re-layout here.  (#301009, 
+	Mathias Hasselmann)
 
 	* tests/testtext.c: Add some more attribute tests.
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 665c16f3ce..d06e8aeb99 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,8 +1,12 @@
 2005-04-29  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/testiconview.c: Add some more tests.
+
 	* gtk/gtkiconview.c (gtk_icon_view_select_path): Don't crash
 	if the path does not point to a row in the model.  (#300909,
 	Mathias Hasselmann)
+	(gtk_icon_view_rows_reordered): Re-layout here.  (#301009, 
+	Mathias Hasselmann)
 
 	* tests/testtext.c: Add some more attribute tests.
 
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index fc8583c0da..35ec66e3f5 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -2555,6 +2555,8 @@ gtk_icon_view_rows_reordered (GtkTreeModel *model,
   g_list_free (icon_view->priv->items);
   icon_view->priv->items = items;
 
+  gtk_icon_view_queue_layout (icon_view);
+
   verify_items (icon_view);  
 }
 
diff --git a/tests/testiconview.c b/tests/testiconview.c
index 988864bda9..9d53083e19 100644
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -63,7 +63,7 @@ fill_model (GtkTreeModel *model)
       g_free (str2);
       i++;
     }
-
+  
   gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store), 2, GTK_SORT_ASCENDING);
 }
 
@@ -103,6 +103,21 @@ foreach_selected_remove (GtkWidget *button, GtkIconView *icon_list)
 }
 
 
+static void
+swap_rows (GtkWidget *button, GtkIconView *icon_list)
+{
+  GtkTreeIter iter, iter2;
+  GtkTreeModel *model;
+
+  model = gtk_icon_view_get_model (icon_list);
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model), -2, GTK_SORT_ASCENDING);
+
+  gtk_tree_model_get_iter_first (model, &iter);
+  iter2 = iter;
+  gtk_tree_model_iter_next (model, &iter2);
+  gtk_list_store_swap (GTK_LIST_STORE (model), &iter, &iter2);
+}
+
 static void
 add_n_items (GtkIconView *icon_list, gint n)
 {
@@ -217,6 +232,15 @@ select_all (GtkWidget *button, GtkIconView *icon_list)
   gtk_icon_view_select_all (icon_list);
 }
 
+static void
+select_nonexisting (GtkWidget *button, GtkIconView *icon_list)
+{  
+  GtkTreePath *path = gtk_tree_path_new_from_indices (999999, -1);
+  gtk_icon_view_select_path (icon_list, path);
+  gtk_tree_path_free (path);
+  gtk_icon_view_select_all (icon_list);
+}
+
 static void
 unselect_all (GtkWidget *button, GtkIconView *icon_list)
 {
@@ -404,6 +428,10 @@ main (gint argc, gchar **argv)
   g_signal_connect (button, "clicked", G_CALLBACK (foreach_selected_remove), icon_list);
   gtk_box_pack_start_defaults (GTK_BOX (bbox), button);
 
+  button = gtk_button_new_with_label ("Swap");
+  g_signal_connect (button, "clicked", G_CALLBACK (swap_rows), icon_list);
+  gtk_box_pack_start_defaults (GTK_BOX (bbox), button);
+
   bbox = gtk_hbutton_box_new ();
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
   gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
@@ -416,6 +444,10 @@ main (gint argc, gchar **argv)
   g_signal_connect (button, "clicked", G_CALLBACK (unselect_all), icon_list);
   gtk_box_pack_start_defaults (GTK_BOX (bbox), button);
   
+  button = gtk_button_new_with_label ("Select nonexisting");
+  g_signal_connect (button, "clicked", G_CALLBACK (select_nonexisting), icon_list);
+  gtk_box_pack_start_defaults (GTK_BOX (bbox), button);
+
   gtk_paned_pack1 (GTK_PANED (paned), vbox, TRUE, FALSE);
 
   icon_list = gtk_icon_view_new ();