diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c
index 1d1c440acf..fe5981cd67 100644
--- a/cheevos/cheevos.c
+++ b/cheevos/cheevos.c
@@ -2049,6 +2049,23 @@ void cheevos_populate_menu(void *data)
    cheevo_t *cheevo              = cheevos_locals.core.cheevos;
    end                           = cheevo + cheevos_locals.core.count;
 
+   if(settings->bools.cheevos_enable && settings->bools.cheevos_hardcore_mode_enable 
+      && cheevos_loaded)
+   {
+      if (!cheevos_hardcore_paused)
+         menu_entries_append_enum(info->list,
+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE),
+               msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE),
+               MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE,
+               MENU_SETTING_ACTION_PAUSE_ACHIEVEMENTS, 0, 0);
+      else
+         menu_entries_append_enum(info->list,
+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_RESUME),
+               msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_RESUME),
+               MENU_ENUM_LABEL_ACHIEVEMENT_RESUME,
+               MENU_SETTING_ACTION_RESUME_ACHIEVEMENTS, 0, 0);
+   }
+
    if (cheevo)
    {
       for (i = 0; cheevo < end; i++, cheevo++)
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 2ee3e1656d..47a804a5ae 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -2731,25 +2731,6 @@ static int menu_displaylist_parse_load_content_settings(
             msg_hash_to_str(MENU_ENUM_LABEL_NO_ITEMS),
             MENU_ENUM_LABEL_NO_ITEMS,
             MENU_SETTING_NO_ITEM, 0, 0);
-
-#ifdef HAVE_CHEEVOS
-      if(settings->bools.cheevos_enable && settings->bools.cheevos_hardcore_mode_enable)
-      {
-         if (!cheevos_hardcore_paused)
-            menu_entries_append_enum(info->list,
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE),
-                  msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE),
-                  MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE,
-                  MENU_SETTING_ACTION_PAUSE_ACHIEVEMENTS, 0, 0);
-         else
-            menu_entries_append_enum(info->list,
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_RESUME),
-                  msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_RESUME),
-                  MENU_ENUM_LABEL_ACHIEVEMENT_RESUME,
-                  MENU_SETTING_ACTION_RESUME_ACHIEVEMENTS, 0, 0);
-      }
-#endif
-
    return 0;
 }