diff --git a/ChangeLog b/ChangeLog
index ec7d22b132..88cd2b1cac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-18  Michael Natterer  <mitch@gimp.org>
+
+	* app/widgets/gimpfiledialog.c (gimp_file_dialog_set_image): use
+	file_utils_uri_display_basename() instead of g_path_get_basename()
+	to get an uri's basename. Fixes bug #347544.
+
 2006-07-18  Sven Neumann  <sven@gimp.org>
 
 	* app/widgets/gimppaletteeditor.c (gimp_palette_editor_get_index,
diff --git a/app/widgets/gimpfiledialog.c b/app/widgets/gimpfiledialog.c
index bb3d599598..bf1ab90911 100644
--- a/app/widgets/gimpfiledialog.c
+++ b/app/widgets/gimpfiledialog.c
@@ -392,7 +392,7 @@ gimp_file_dialog_set_image (GimpFileDialog *dialog,
   gimp_file_dialog_set_file_proc (dialog, NULL);
 
   dirname  = g_path_get_dirname (uri);
-  basename = g_path_get_basename (uri);
+  basename = file_utils_uri_display_basename (uri);
 
   if (dirname && strlen (dirname) && strcmp (dirname, "."))
     gtk_file_chooser_set_current_folder_uri (GTK_FILE_CHOOSER (dialog),