diff --git a/src/miners/fs/tracker-config.c b/src/miners/fs/tracker-config.c
index da0a387..88b74d4 100644
--- a/src/miners/fs/tracker-config.c
+++ b/src/miners/fs/tracker-config.c
@@ -1009,23 +1009,22 @@ config_save (TrackerConfig *config)
 					 * solution at some point.
 					 */
 
-					dir = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
-					if (g_strcmp0 (l->data, g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)) == 0) {
-						path_to_use = "&DESKTOP";
-					} else if (g_strcmp0 (l->data, g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS)) == 0) {
-						path_to_use = "&DOCUMENTS";
-					} else if (g_strcmp0 (l->data, g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD)) == 0) {
-						path_to_use = "&DOWNLOAD";
-					} else if (g_strcmp0 (l->data, g_get_user_special_dir (G_USER_DIRECTORY_MUSIC)) == 0) {
-						path_to_use = "&MUSIC";
-					} else if (g_strcmp0 (l->data, g_get_user_special_dir (G_USER_DIRECTORY_PICTURES)) == 0) {
-						path_to_use = "&PICTURES";
-					} else if (g_strcmp0 (l->data, g_get_user_special_dir (G_USER_DIRECTORY_PUBLIC_SHARE)) == 0) {
-						path_to_use = "&PUBLIC_SHARE";
-					} else if (g_strcmp0 (l->data, g_get_user_special_dir (G_USER_DIRECTORY_TEMPLATES)) == 0) {
-						path_to_use = "&TEMPLATES";
-					} else if (g_strcmp0 (l->data, g_get_user_special_dir (G_USER_DIRECTORY_VIDEOS)) == 0) {
-						path_to_use = "&VIDEOS";
+					if (g_strcmp0 (l->data, dir = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)) == 0) {
+						path_to_use = dir;
+					} else if (g_strcmp0 (l->data, dir = g_get_user_special_dir (G_USER_DIRECTORY_DOCUMENTS)) == 0) {
+						path_to_use = dir;
+					} else if (g_strcmp0 (l->data, dir = g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD)) == 0) {
+						path_to_use = dir;
+					} else if (g_strcmp0 (l->data, dir = g_get_user_special_dir (G_USER_DIRECTORY_MUSIC)) == 0) {
+						path_to_use = dir;
+					} else if (g_strcmp0 (l->data, dir = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES)) == 0) {
+						path_to_use = dir;
+					} else if (g_strcmp0 (l->data, dir = g_get_user_special_dir (G_USER_DIRECTORY_PUBLIC_SHARE)) == 0) {
+						path_to_use = dir;
+					} else if (g_strcmp0 (l->data, dir = g_get_user_special_dir (G_USER_DIRECTORY_TEMPLATES)) == 0) {
+						path_to_use = dir;
+					} else if (g_strcmp0 (l->data, dir = g_get_user_special_dir (G_USER_DIRECTORY_VIDEOS)) == 0) {
+						path_to_use = dir;
 					} else {
 						path_to_use = NULL;
 					}
