diff --git a/menu/menu_entry.c b/menu/menu_entry.c
index c41d9b2966..63fc5b0693 100644
--- a/menu/menu_entry.c
+++ b/menu/menu_entry.c
@@ -33,11 +33,15 @@
 /* Clicks the back button */
 int menu_entry_go_back(void)
 {
+   size_t new_selection_ptr;
    menu_list_t *menu_list = menu_list_get_ptr();
-   menu_navigation_t *nav = menu_navigation_get_ptr();
    if (!menu_list)
       return -1;
-   menu_list_pop_stack(menu_list, &nav->selection_ptr);
+
+   menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &new_selection_ptr);
+   menu_list_pop_stack(menu_list, &new_selection_ptr);
+   menu_navigation_ctl(MENU_NAVIGATION_CTL_SET_SELECTION, &new_selection_ptr);
+
    return 0;
 }