diff --git a/ChangeLog b/ChangeLog
index 688b7601da..edf3d5c4ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-03  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkfilechooserdefault.c (update_chooser_entry):
+	Exit early if we can't get file info - this happens
+	if the iter points to the row where we are editing
+	the name for a newly created folder.  (#392191, Michael
+	Partridge, patch by Kristian Rietveld)
+
 2007-01-03  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/*.c:
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index f029996091..1e1969f7d5 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -6139,6 +6139,12 @@ update_chooser_entry (GtkFileChooserDefault *impl)
 
       info = _gtk_file_system_model_get_info (impl->browse_files_model, &child_iter);
 
+      /* If the cursor moved to the row of the newly created folder, 
+       * retrieving info will return NULL.
+       */
+      if (!info)
+	return;
+
       g_free (impl->browse_files_last_selected_name);
       impl->browse_files_last_selected_name = g_strdup (gtk_file_info_get_display_name (info));