diff --git a/menu/menu_entry.c b/menu/menu_entry.c
index dcc7116442..8891383e40 100644
--- a/menu/menu_entry.c
+++ b/menu/menu_entry.c
@@ -362,8 +362,7 @@ int menu_entry_iterate(unsigned action)
    if (action != MENU_ACTION_NOOP || menu->need_refresh || menu_display_update_pending())
       runloop->frames.video.current.menu.framebuf.dirty   = true;
 
-   cbs = (menu_file_list_cbs_t*)menu_list_get_actiondata_at_offset(
-         menu_list->selection_buf, nav->selection_ptr);
+   cbs = (menu_file_list_cbs_t*)menu_list_get_last_stack_actiondata(menu_list);
 
    menu_list_get_last_stack(menu_list, NULL, &label, NULL);
 
diff --git a/retroarch.c b/retroarch.c
index 0e10a6f91f..684ad25780 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1302,7 +1302,8 @@ void rarch_main_set_state(unsigned cmd)
                global->system.frame_time_last = 0;
             }
 
-            runloop->is_menu = true;
+            menu->need_refresh = true;
+            runloop->is_menu   = true;
          }
 #endif
          break;