diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index ac9f70282e..54e6bbc799 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1211,6 +1211,8 @@ static void xmb_render(void)
 {
    unsigned i, current, end;
    runloop_t *runloop = rarch_main_get_ptr();
+   settings_t *settings = config_get_ptr();
+
 
    menu_handle_t *menu = menu_driver_get_ptr();
    if (!menu)
@@ -1226,12 +1228,26 @@ static void xmb_render(void)
    current = menu->navigation.selection_ptr;
    end     = menu_list_get_size(menu->menu_list);
 
-   for (i = 0; i < end; i++)
+   if (settings->menu.pointer.enable)
    {
-      float item_y = xmb->margins.screen.top + xmb_item_y(xmb, i, current);
+      for (i = 0; i < end; i++)
+      {
+         float item_y = xmb->margins.screen.top + xmb_item_y(xmb, i, current);
 
-      if (menu->mouse.y > item_y && menu->mouse.y < item_y + xmb->icon.size)
-         menu->mouse.ptr = i;
+         if (menu->pointer.y > item_y && menu->pointer.y < item_y + xmb->icon.size)
+            menu->pointer.ptr = i;
+      }
+   }
+
+   if (settings->menu.mouse.enable)
+   {
+      for (i = 0; i < end; i++)
+      {
+         float item_y = xmb->margins.screen.top + xmb_item_y(xmb, i, current);
+
+         if (menu->mouse.y > item_y && menu->mouse.y < item_y + xmb->icon.size)
+            menu->mouse.ptr = i;
+      }
    }
 
    runloop->frames.video.current.menu.animation.is_active = false;
@@ -1498,6 +1514,7 @@ static void *xmb_init(void)
    xmb->margins.setting.left    = 600.0 * scale_factor;
 
    menu->categories.size      = 1;
+   menu->header_height = xmb->icon.size;
 
    if (global->core_info)
       menu->categories.size   = global->core_info->count + 1;
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 4455b4f276..98dccd21f3 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -804,7 +804,7 @@ static int pointer_tap(menu_file_list_cbs_t *cbs, const char *path,
    else if (menu->pointer.ptr == menu->navigation.selection_ptr)
       return cbs->action_ok(path, label, type, menu->navigation.selection_ptr);
    else
-      menu->navigation.selection_ptr = menu->pointer.ptr;
+      menu_navigation_set(&menu->navigation, menu->pointer.ptr, false);
 
    return 0;
 }