diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index ca6f7d2dbd..e11d19dae1 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -3922,10 +3922,10 @@ static int xmb_list_push(void *data, void *userdata,
          entry.enum_idx      = MENU_ENUM_LABEL_QUIT_RETROARCH;
          menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
 #endif
-         entry.enum_idx      = MENU_ENUM_LABEL_SHUTDOWN;
+         entry.enum_idx      = MENU_ENUM_LABEL_REBOOT;
          menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
 
-         entry.enum_idx      = MENU_ENUM_LABEL_REBOOT;
+         entry.enum_idx      = MENU_ENUM_LABEL_SHUTDOWN;
          menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
          info->need_push    = true;
          ret = 0;
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 8b8f50333d..532e3dc161 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -2367,15 +2367,6 @@ static bool setting_append_list(
 #endif
 
 #if defined(HAVE_LAKKA)
-         CONFIG_ACTION(
-               list, list_info,
-               MENU_ENUM_LABEL_SHUTDOWN,
-               MENU_ENUM_LABEL_VALUE_SHUTDOWN,
-               &group_info,
-               &subgroup_info,
-               parent_group);
-         menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_SHUTDOWN);
-
          CONFIG_ACTION(
                list, list_info,
                MENU_ENUM_LABEL_REBOOT,
@@ -2384,6 +2375,15 @@ static bool setting_append_list(
                &subgroup_info,
                parent_group);
          menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REBOOT);
+
+         CONFIG_ACTION(
+               list, list_info,
+               MENU_ENUM_LABEL_SHUTDOWN,
+               MENU_ENUM_LABEL_VALUE_SHUTDOWN,
+               &group_info,
+               &subgroup_info,
+               parent_group);
+         menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_SHUTDOWN);
 #endif
 
          CONFIG_ACTION(