diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index 39065621f7..8bbf55d025 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -1969,6 +1969,10 @@ gtk_tree_model_foreach_helper (GtkTreeModel            *model,
                                GtkTreeModelForeachFunc  func,
                                gpointer                 user_data)
 {
+  gboolean iters_persist;
+
+  iters_persist = gtk_tree_model_get_flags (model) & GTK_TREE_MODEL_ITERS_PERSIST;
+
   do
     {
       GtkTreeIter child;
@@ -1976,6 +1980,12 @@ gtk_tree_model_foreach_helper (GtkTreeModel            *model,
       if ((* func) (model, path, iter, user_data))
         return TRUE;
 
+      if (!iters_persist)
+        {
+          if (!gtk_tree_model_get_iter (model, iter, path))
+            return TRUE;
+        }
+
       if (gtk_tree_model_iter_children (model, &child, iter))
         {
           gtk_tree_path_down (path);