diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index 0567c964fc..795fdd227d 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -133,7 +133,7 @@ static int action_right_scroll(unsigned type, const char *label,
    else
    {
       if ((menu_list_get_size(menu_list) > 0))
-         menu_navigation_set_last(nav);
+         menu_navigation_ctl(MENU_NAVIGATION_CTL_SET_LAST, NULL);
    }
 
    return 0;
diff --git a/menu/menu_navigation.c b/menu/menu_navigation.c
index f2912781f6..bfb526331a 100644
--- a/menu/menu_navigation.c
+++ b/menu/menu_navigation.c
@@ -114,6 +114,7 @@ bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data)
          }
          return true;
       case MENU_NAVIGATION_CTL_SET_LAST:
+         nav->selection_ptr = menu_list_get_size(menu_list) - 1;
          if (driver->navigation_set_last)
             driver->navigation_set_last();
          return true;
@@ -177,22 +178,6 @@ void menu_navigation_set(menu_navigation_t *nav,
    menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
 }
 
-/**
- * menu_navigation_set_last:
- *
- * Sets navigation pointer to last index.
- **/
-void menu_navigation_set_last(menu_navigation_t *nav)
-{
-   menu_list_t *menu_list = menu_list_get_ptr();
-   if (!menu_list || !nav)
-      return;
-
-   nav->selection_ptr = menu_list_get_size(menu_list) - 1;
-
-   menu_navigation_ctl(MENU_NAVIGATION_CTL_SET_LAST, NULL);
-}
-
 /**
  * menu_navigation_descend_alphabet:
  * @ptr_out               : Amount of indices to 'scroll' to get
diff --git a/menu/menu_navigation.h b/menu/menu_navigation.h
index 714e51e1c3..d303928d0c 100644
--- a/menu/menu_navigation.h
+++ b/menu/menu_navigation.h
@@ -72,13 +72,6 @@ void menu_navigation_clear(menu_navigation_t *nav, bool pending_push);
  **/
 void menu_navigation_set(menu_navigation_t *nav, size_t i, bool scroll);
 
-/**
- * menu_navigation_set_last:
- *
- * Sets navigation pointer to last index.
- **/
-void menu_navigation_set_last(menu_navigation_t *nav);
-
 /**
  * menu_navigation_descend_alphabet:
  * @ptr_out               : Amount of indices to 'scroll' to get