diff --git a/menu/menu_entries_cbs_select.c b/menu/menu_entries_cbs_select.c
index 3aaae73157..4ce5211ce8 100644
--- a/menu/menu_entries_cbs_select.c
+++ b/menu/menu_entries_cbs_select.c
@@ -27,7 +27,6 @@ static int action_select_default(const char *path, const char *label, unsigned t
    menu_entry_t entry;
    enum menu_action action   = MENU_ACTION_NOOP;
    menu_file_list_cbs_t *cbs = NULL;
-   menu_navigation_t *nav    = menu_navigation_get_ptr();
    menu_list_t    *menu_list = menu_list_get_ptr();
    rarch_setting_t *setting  = menu_setting_find(
          menu_list->selection_buf->list[idx].label);
@@ -39,7 +38,6 @@ static int action_select_default(const char *path, const char *label, unsigned t
    if (setting_is_of_path_type(setting))
       return 0;
 
-   nav->selection_ptr = idx;
    if ((cbs && cbs->action_ok) || setting_is_of_general_type(setting))
        action = MENU_ACTION_OK;
    else
diff --git a/menu/menu_entry.c b/menu/menu_entry.c
index a3fd51d670..e0ea291918 100644
--- a/menu/menu_entry.c
+++ b/menu/menu_entry.c
@@ -392,10 +392,9 @@ int menu_entry_get_current_id(bool use_representation)
 int menu_entry_select(uint32_t i)
 {
    menu_entry_t entry;
-   menu_list_t    *menu_list = menu_list_get_ptr();
-   rarch_setting_t *setting  = menu_setting_find(
-         menu_list->selection_buf->list[i].label);
-
+   menu_navigation_t *nav = menu_navigation_get_ptr();
+    
+   nav->selection_ptr = i;
    menu_entry_get(&entry, i, NULL, false);
 
    return menu_entry_action(&entry, i, MENU_ACTION_SELECT);