diff --git a/menu/drivers/glui.c b/menu/drivers/glui.c
index 2b020cac48..72cb12e3cb 100644
--- a/menu/drivers/glui.c
+++ b/menu/drivers/glui.c
@@ -304,6 +304,9 @@ static void glui_frame(void)
    glui->term_width  = (gl->win_width - glui->margin * 2) / glui->glyph_width;
    glui->term_height = (gl->win_height - glui->margin * 2) / glui->line_height - 2;
 
+   menu->frame_buf.width  = gl->win_width;
+   menu->frame_buf.height = gl->win_height;
+
    menu->mouse.ptr = (menu->mouse.y - glui->margin) /
          glui->line_height - 2 + menu->begin;
 
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index eead382638..5b5d6b17f7 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1295,6 +1295,9 @@ static void *xmb_init(void)
    xmb->item.active.factor      = 3.0;
    xmb->under_offset.item       = 5.0;
 
+   menu->frame_buf.width  = gl->win_width;
+   menu->frame_buf.height = gl->win_height;
+
    if (gl->win_width >= 3840)
       scale_factor              = 2.0;
    else if (gl->win_width >= 2560)
diff --git a/menu/menu_entries_cbs_iterate.c b/menu/menu_entries_cbs_iterate.c
index dfb38bc479..678423f658 100644
--- a/menu/menu_entries_cbs_iterate.c
+++ b/menu/menu_entries_cbs_iterate.c
@@ -162,9 +162,6 @@ static int mouse_post_iterate(menu_file_list_cbs_t *cbs, const char *path,
    if (!menu->mouse.enable)
       return 0;
 
-   if (menu->mouse.ptr <= menu_list_get_size(menu->menu_list)-1)
-      menu_navigation_set(&menu->navigation, menu->mouse.ptr, false);
-
    if (menu->mouse.left)
    {
       if (!menu->mouse.oldleft)