diff --git a/ChangeLog b/ChangeLog
index 849a4e7d53..e71de94423 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-06-18  Olle Bergkvist <olle.bergkvist@yahoo.se>
+
+	http://bugzilla.gnome.org/show_bug.cgi?id=538784 - Don't change
+	the filename in the name entry in CREATE_FOLDER mode when changing
+	folders, so that you can enter a new subfolder name, double-click on a
+	folder to change to it, and close the dialog.
+
+	* gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't change
+	the filename in the entry in CREATE_FOLDER mode, either.
+
 2008-06-18  Olle Bergkvist <olle.bergkvist@yahoo.se>
 
 	http://bugzilla.gnome.org/show_bug.cgi?id=419737#c59 - The file
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index b120a1ac7e..f360bee4e1 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -6714,13 +6714,14 @@ update_chooser_entry (GtkFileChooserDefault *impl)
             g_strdup (g_file_info_get_display_name (info));
 
           if (impl->action == GTK_FILE_CHOOSER_ACTION_OPEN ||
-              impl->action == GTK_FILE_CHOOSER_ACTION_SAVE)
+              impl->action == GTK_FILE_CHOOSER_ACTION_SAVE ||
+	      impl->action == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
 	    {
 	      /* We don't want the name to change when clicking on a folder... */
 	      change_entry = (g_file_info_get_file_type (info) != G_FILE_TYPE_DIRECTORY);
 	    }
           else
-	    change_entry = TRUE;                                /* ... unless we are in one of the folder modes */
+	    change_entry = TRUE; /* ... unless we are in SELECT_FOLDER mode */
 
           if (change_entry)
             {