diff --git a/ChangeLog b/ChangeLog
index 0346f51a52..0e60718994 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-19  Morten Welinder  <terra@gnome.org>
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_set_current_folder): Test existance of
+	the path after checking for locality, if needed.
+
 2004-03-19  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #137520.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0346f51a52..0e60718994 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-03-19  Morten Welinder  <terra@gnome.org>
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_set_current_folder): Test existance of
+	the path after checking for locality, if needed.
+
 2004-03-19  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #137520.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0346f51a52..0e60718994 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2004-03-19  Morten Welinder  <terra@gnome.org>
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_set_current_folder): Test existance of
+	the path after checking for locality, if needed.
+
 2004-03-19  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #137520.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0346f51a52..0e60718994 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-03-19  Morten Welinder  <terra@gnome.org>
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_set_current_folder): Test existance of
+	the path after checking for locality, if needed.
+
 2004-03-19  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #137520.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0346f51a52..0e60718994 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-03-19  Morten Welinder  <terra@gnome.org>
+
+	* gtk/gtkfilechooserdefault.c
+	(gtk_file_chooser_default_set_current_folder): Test existance of
+	the path after checking for locality, if needed.
+
 2004-03-19  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #137520.
diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 456c7d5e31..36e5c21f65 100644
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -3723,10 +3723,6 @@ gtk_file_chooser_default_set_current_folder (GtkFileChooser    *chooser,
 {
   GtkFileChooserDefault *impl = GTK_FILE_CHOOSER_DEFAULT (chooser);
 
-  /* Test validity of path here.  */
-  if (!check_is_folder (impl->file_system, path, error))
-    return FALSE;
-
   if (impl->local_only &&
       !gtk_file_system_path_is_local (impl->file_system, path))
     {
@@ -3738,6 +3734,10 @@ gtk_file_chooser_default_set_current_folder (GtkFileChooser    *chooser,
       return FALSE;
     }
 
+  /* Test validity of path here.  */
+  if (!check_is_folder (impl->file_system, path, error))
+    return FALSE;
+
   if (!_gtk_path_bar_set_path (GTK_PATH_BAR (impl->browse_path_bar), path, error))
     return FALSE;