diff --git a/ChangeLog b/ChangeLog
index 37acfc1ea..63581f743 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-01  Christian Neumair  <cneumair@gnome.org>
+
+	* src/file-manager/fm-directory-view.c (done_loading):
+	Only report that loading is complete and schedule selection 
+	if all files are seen. Fixes #421759.
+
 2008-08-31  Cosimo Cecchi  <cosimoc@gnome.org>
 
 	* libnautilus-private/nautilus-icon-container.c: (key_press_event):
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 9afae5c0a..d473ac0a1 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -2356,18 +2356,20 @@ done_loading (FMDirectoryView *view,
 	 * is no NautilusWindowInfo any more.
 	 */
 	if (view->details->window != NULL) {
-		nautilus_window_info_report_load_complete (view->details->window, NAUTILUS_VIEW (view));
+		if (all_files_seen) {
+			nautilus_window_info_report_load_complete (view->details->window, NAUTILUS_VIEW (view));
+		}
+
 		schedule_update_menus (view);
 		schedule_update_status (view);
 		check_for_directory_hard_limit (view);
 		reset_update_interval (view);
 
 		locations_selected = view->details->pending_locations_selected;
-		if (locations_selected != NULL) {
+		if (locations_selected != NULL && all_files_seen) {
 			view->details->pending_locations_selected = NULL;
 			
 			selection = file_list_from_location_list (locations_selected);
-			eel_g_object_list_free (locations_selected);
 
 			view->details->selection_change_is_due_to_shell = TRUE;
 			fm_directory_view_set_selection (view, selection);
@@ -2391,6 +2393,7 @@ done_loading (FMDirectoryView *view,
 				fm_directory_view_reveal_selection (view);
 			}
 		}
+		eel_g_object_list_free (locations_selected);
 		fm_directory_view_display_selection_info (view);
 	}