diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index 2cf6c24d7..7e5119c08 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-10  Jens Granseuer  <jensgr@gmx.net>
+
+	* gnome-settings-font.c: (load_cursor): if the new font path could not
+	be set, revert to the old path (fixes bug #397504)
+
 2007-02-09  Jens Granseuer  <jensgr@gmx.net>
 
 	Based on a patch by: Bastien Nocera <hadess@hadess.net>
diff --git a/gnome-settings-daemon/gnome-settings-font.c b/gnome-settings-daemon/gnome-settings-font.c
index 3ad0d0a79..4bcaf341c 100644
--- a/gnome-settings-daemon/gnome-settings-font.c
+++ b/gnome-settings-daemon/gnome-settings-font.c
@@ -184,8 +184,11 @@ load_cursor (GConfClient *client)
   gdk_error_trap_push ();
   XSetFontPath (gdk_display, new_font_path, new_n_fonts);
   gdk_flush ();
-  gdk_error_trap_pop ();
- 
+
+  /* if there was an error setting the new path, revert */
+  if (gdk_error_trap_pop ())
+    XSetFontPath (gdk_display, font_path, n_fonts); 
+
   XFreeFontPath (font_path);
 
   g_free (new_font_path);