diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index a543fa7867..f2b7a36b0c 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -499,9 +499,11 @@ typedef struct
    struct scaler_ctx image_scaler;
 } rgui_t;
 
-static unsigned mini_thumbnail_max_width = 0;
+static unsigned mini_thumbnail_max_width  = 0;
 static unsigned mini_thumbnail_max_height = 0;
 
+static const uint8_t *rgui_font_framebuf  = NULL;
+
 typedef struct
 {
    unsigned max_width;
@@ -1559,7 +1561,7 @@ static bool init_font(menu_handle_t *menu, const uint8_t *font_bmp_buf)
             font_bmp_buf + 54 + 3 * (256 * (255 - 16 * y) + 16 * x));
    }
 
-   menu_display_set_font_framebuffer(font);
+   rgui_font_framebuf = font;
 
    return true;
 }
@@ -1580,7 +1582,7 @@ static bool rguidisp_init_font(menu_handle_t *menu)
       return init_font(menu, font_bmp_buf);
 #endif
 
-   menu_display_set_font_framebuffer(font_bin_buf);
+   rgui_font_framebuf = font_bin_buf;
 
    return true;
 }
@@ -1661,7 +1663,7 @@ static void rgui_render_messagebox(rgui_t *rgui, const char *message)
    struct string_list *list   = NULL;
    settings_t *settings       = config_get_ptr();
    size_t pitch               = menu_display_get_framebuffer_pitch();
-   const uint8_t *font_fb     = menu_display_get_font_framebuffer();
+   const uint8_t *font_fb     = rgui_font_framebuf;
    (void)settings;
 
    if (!message || !*message)
@@ -1791,7 +1793,7 @@ static void rgui_render(void *data, bool is_idle)
    settings_t *settings           = config_get_ptr();
    rgui_t *rgui                   = (rgui_t*)data;
    size_t pitch                   = menu_display_get_framebuffer_pitch();
-   const uint8_t *font_fb         = menu_display_get_font_framebuffer();
+   const uint8_t *font_fb         = rgui_font_framebuf;
 
    static bool display_kb         = false;
    bool current_display_cb        = false;
@@ -2659,7 +2661,7 @@ static void rgui_free(void *data)
    }
 
    fb_font_inited = menu_display_get_font_data_init();
-   font_fb = menu_display_get_font_framebuffer();
+   font_fb        = rgui_font_framebuf;
 
    if (fb_font_inited)
       free((void*)font_fb);
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index cddec7f9da..576941ce01 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -183,7 +183,6 @@ static bool menu_display_has_windowed            = false;
 static bool menu_display_msg_force               = false;
 static bool menu_display_font_alloc_framebuf     = false;
 static bool menu_display_framebuf_dirty          = false;
-static const uint8_t *menu_display_font_framebuf = NULL;
 static menu_display_ctx_driver_t *menu_disp      = NULL;
 
 /* when enabled, on next iteration the 'Quick Menu' list will
@@ -502,16 +501,6 @@ video_coord_array_t *menu_display_get_coords_array(void)
    return &menu_disp_ca;
 }
 
-const uint8_t *menu_display_get_font_framebuffer(void)
-{
-   return menu_display_font_framebuf;
-}
-
-void menu_display_set_font_framebuffer(const uint8_t *buffer)
-{
-   menu_display_font_framebuf = buffer;
-}
-
 bool menu_display_libretro_running(
       bool rarch_is_inited,
       bool rarch_is_dummy_core)
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 5136230194..4ce4624bf0 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -549,8 +549,6 @@ void menu_display_font_free(font_data_t *font);
 
 void menu_display_coords_array_reset(void);
 video_coord_array_t *menu_display_get_coords_array(void);
-const uint8_t *menu_display_get_font_framebuffer(void);
-void menu_display_set_font_framebuffer(const uint8_t *buffer);
 bool menu_display_libretro(bool is_idle, bool is_inited, bool is_dummy);
 bool menu_display_libretro_running(bool rarch_is_inited,
       bool rarch_is_dummy_core);