diff --git a/cheevos.c b/cheevos.c
index c824efab23..fd3505fd65 100644
--- a/cheevos.c
+++ b/cheevos.c
@@ -1887,32 +1887,8 @@ void cheevos_populate_menu(menu_displaylist_info_t *info)
    const cheevo_t *end;
    cheevo_t *cheevo;
    
-   RARCH_LOG("CHEEVOS POPULATING MENU");
-   
-   menu_entries_push(info->list, "", "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    menu_entries_push(info->list, "Unlocked Achievements:", "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
-   
-   for (cheevo = cheevos_locals.core.cheevos, end = cheevos_locals.core.cheevos + cheevos_locals.core.count; cheevo < end; cheevo++)
-   {
-      if (cheevo->active)
-      {
-         menu_entries_push(info->list, cheevo->title, cheevo->description, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
-      }
-   }
-   
-   if (config_get_ptr()->cheevos.test_unofficial)
-   {
-      for (cheevo = cheevos_locals.unofficial.cheevos, end = cheevos_locals.unofficial.cheevos + cheevos_locals.unofficial.count; cheevo < end; cheevo++)
-      {
-         if (cheevo->active)
-         {
-            menu_entries_push(info->list, cheevo->title, cheevo->description, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
-         }
-      }
-   }
-   
    menu_entries_push(info->list, "", "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
-   menu_entries_push(info->list, "Locked Achievements:", "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
    
    for (cheevo = cheevos_locals.core.cheevos, end = cheevos_locals.core.cheevos + cheevos_locals.core.count; cheevo < end; cheevo++)
    {
@@ -1932,4 +1908,27 @@ void cheevos_populate_menu(menu_displaylist_info_t *info)
          }
       }
    }
+   
+   menu_entries_push(info->list, "", "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
+   menu_entries_push(info->list, "Locked Achievements:", "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
+   menu_entries_push(info->list, "", "", MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
+   
+   for (cheevo = cheevos_locals.core.cheevos, end = cheevos_locals.core.cheevos + cheevos_locals.core.count; cheevo < end; cheevo++)
+   {
+      if (cheevo->active)
+      {
+         menu_entries_push(info->list, cheevo->title, cheevo->description, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
+      }
+   }
+   
+   if (config_get_ptr()->cheevos.test_unofficial)
+   {
+      for (cheevo = cheevos_locals.unofficial.cheevos, end = cheevos_locals.unofficial.cheevos + cheevos_locals.unofficial.count; cheevo < end; cheevo++)
+      {
+         if (cheevo->active)
+         {
+            menu_entries_push(info->list, cheevo->title, cheevo->description, MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
+         }
+      }
+   }
 }
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 5e0da9c648..e2d1ced89f 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1744,7 +1744,7 @@ static int menu_displaylist_parse_load_content_settings(menu_displaylist_info_t
             menu_hash_to_str(MENU_LABEL_SHADER_OPTIONS),
             MENU_SETTING_ACTION, 0, 0);
 #endif
-#if 0
+#ifdef HAVE_CHEEVOS
       menu_entries_push(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_ACHIEVEMENT_LIST),
          menu_hash_to_str(MENU_LABEL_ACHIEVEMENT_LIST),