diff --git a/projectorganizer/src/prjorg-sidebar.c b/projectorganizer/src/prjorg-sidebar.c
index f95cffabe..515499f72 100644
--- a/projectorganizer/src/prjorg-sidebar.c
+++ b/projectorganizer/src/prjorg-sidebar.c
@@ -1157,7 +1157,8 @@ static gboolean follow_editor_on_idle(gpointer foo)
 			
 		g_free(path);
 		path = NULL;
-		gtk_tree_model_iter_next(model, &root_iter);
+		if (!gtk_tree_model_iter_next(model, &root_iter))
+			break;
 	}
 	
 	if (!path)