diff --git a/ChangeLog b/ChangeLog
index a2caae2..33e96c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-20  Glynn Foster  <glynn.foster@sun.com>
+
+	* src/fileselection.c: Fix for #171838, from Carlos
+	Parra.
+
 2005-04-20  Glynn Foster  <glynn.foster@sun.com>
 
 	* src/entry.c, src/option.c, src/zenity.h: Clean
diff --git a/src/fileselection.c b/src/fileselection.c
index 6930437..4e51eec 100644
--- a/src/fileselection.c
+++ b/src/fileselection.c
@@ -64,7 +64,10 @@ void zenity_fileselection (ZenityData *data, ZenityFileData *file_data)
 
   if (file_data->uri) {
     dir = g_path_get_dirname (file_data->uri);
-    gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dir);
+
+    if (g_path_is_absolute (file_data->uri) == TRUE)
+      gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), dir);
+
     if (file_data->uri[strlen (file_data->uri) - 1] != '/') {
       basename = g_path_get_basename (file_data->uri);
       gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), basename);