diff --git a/src/bin/e_fm_hal.c b/src/bin/e_fm_hal.c
index f9d7d6a82..76044d0ec 100644
--- a/src/bin/e_fm_hal.c
+++ b/src/bin/e_fm_hal.c
@@ -382,10 +382,10 @@ e_fm2_hal_volume_mountpoint_get(E_Volume *v)
 	return strdup(v->mount_point);
      }
    
-   if (v->uuid && v->uuid[0] != '\0')
-     snprintf(buf, sizeof(buf) - 1, "/media/%s", v->uuid);
-   else if (v->label && v->label[0] != '\0')
+   if (v->label && v->label[0] != '\0')
      snprintf(buf, sizeof(buf) - 1, "/media/%s", v->label);
+   else if (v->uuid && v->uuid[0] != '\0')
+     snprintf(buf, sizeof(buf) - 1, "/media/%s", v->uuid);
    else if ((v->storage) && (v->storage->serial) && v->storage->serial[0] != '\0')
      snprintf(buf, sizeof(buf) - 1, "/media/%s", v->storage->serial);
    else