diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 99ca4fa1dd..85da1b8e5f 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -159,8 +159,6 @@ static int action_left_mainmenu(unsigned type, const char *label,
    {
       settings_t       *settings = config_get_ptr();
 
-      menu_navigation_set_selection(0);
-
       if ((list_info.selection != 0)
          || settings->bools.menu_navigation_wraparound_enable)
          push_list = 1;
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index 3ad465dac9..f982745235 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -193,8 +193,6 @@ static int action_right_mainmenu(unsigned type, const char *label,
       menu_driver_ctl(RARCH_MENU_CTL_LIST_GET_SIZE, &list_horiz_info);
       menu_driver_ctl(RARCH_MENU_CTL_LIST_GET_SIZE, &list_tabs_info);
 
-      menu_navigation_set_selection(0);
-
       if ((list_info.selection != (list_horiz_info.size + list_tabs_info.size))
          || settings->bools.menu_navigation_wraparound_enable)
          return action_right_goto_tab();
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index f5b8661ef4..bb8ea6dd8f 100755
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -2278,7 +2278,7 @@ static void xmb_draw_items(
    first = i;
    last  = end - 1;
 
-   /* xmb_calculate_visible_range(xmb, height, end, current, &first, &last); */
+   xmb_calculate_visible_range(xmb, height, end, current, &first, &last);
 
    menu_display_blend_begin();