diff --git a/gfx/gfx_display.c b/gfx/gfx_display.c
index 1b10e9410a..2398c83785 100644
--- a/gfx/gfx_display.c
+++ b/gfx/gfx_display.c
@@ -17,8 +17,6 @@
 #include "gfx_display.h"
 #include "gfx_animation.h"
 
-#include "../configuration.h"
-#include "../frontend/frontend.h"
 #include "video_coord_array.h"
 #include "../verbosity.h"
 
@@ -887,10 +885,8 @@ void gfx_display_draw_cursor(
 {
    gfx_display_ctx_draw_t draw;
    struct video_coords coords;
-   settings_t *settings = config_get_ptr();
-   bool cursor_visible  = settings->bools.video_fullscreen ||
-       !gfx_display_has_windowed;
-   if (!settings->bools.menu_mouse_enable || !cursor_visible)
+   bool cursor_visible  = video_info->fullscreen;
+   if (!video_info->menu_mouse_enable || !cursor_visible)
       return;
 
    coords.vertices      = 4;
diff --git a/retroarch.c b/retroarch.c
index 01b903bf48..dec609453e 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -22136,6 +22136,7 @@ void video_driver_build_info(video_frame_info_t *video_info)
    video_info->max_swapchain_images  = settings->uints.video_max_swapchain_images;
    video_info->windowed_fullscreen   = settings->bools.video_windowed_fullscreen;
    video_info->fullscreen            = settings->bools.video_fullscreen || retroarch_is_forced_fullscreen();
+   video_info->menu_mouse_enable     = settings->bools.menu_mouse_enable;
    video_info->monitor_index         = settings->uints.video_monitor_index;
    video_info->shared_context        = settings->bools.video_shared_context;
 
diff --git a/retroarch.h b/retroarch.h
index c193a6f363..47735f4c3c 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -1091,6 +1091,7 @@ typedef struct video_info
 
 typedef struct video_frame_info
 {
+   bool menu_mouse_enable;
    bool widgets_inited;
    bool widgets_is_paused;
    bool widgets_is_fast_forwarding;