diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index 86c1a4bc7..eefccf16a 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-25  Denis Washington <denisw@svn.gnome.org>
+
+	* gnome-theme-info.c: (add_common_icon_theme_dir_monitor),
+	(look_for_cursor_theme):
+	Fix abug introduced by the changes in revision 7856 which caused
+	cursor themes to not being found anymore.
+
 2007-07-13  Jens Granseuer  <jensgr@gmx.net>
 
 	* gnome-theme-info.c: (gdk_pixbuf_from_xcursor_image),
diff --git a/capplets/common/gnome-theme-info.c b/capplets/common/gnome-theme-info.c
index 1968d89f5..41e81f0b9 100644
--- a/capplets/common/gnome-theme-info.c
+++ b/capplets/common/gnome-theme-info.c
@@ -979,7 +979,7 @@ look_for_cursor_theme (const gchar *theme_dir)
 {
   gchar *cursors_dir;
 
-  cursors_dir = g_build_filename (G_DIR_SEPARATOR_S, theme_dir, "cursors", NULL);
+  cursors_dir = g_build_filename (theme_dir, "cursors", NULL);
 
   if (g_file_test (cursors_dir, G_FILE_TEST_IS_DIR)) {
     gchar *name;
@@ -1043,7 +1043,8 @@ add_common_icon_theme_dir_monitor (GnomeVFSURI                    *theme_dir_uri
   gboolean real_monitor_not_added = FALSE;
   GnomeVFSURI *index_uri;
 
-  uri_string = gnome_vfs_uri_to_string (theme_dir_uri, GNOME_VFS_URI_HIDE_NONE);
+  uri_string = gnome_vfs_uri_to_string (theme_dir_uri,
+                                        GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD);
 
   /* Look for cursor theme in the theme directory */
   look_for_cursor_theme (uri_string);