diff --git a/input/input_driver.c b/input/input_driver.c
index 5a0a38cdbe..c13eba5f01 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -320,16 +320,6 @@ input_driver_state_t *input_state_get_ptr(void)
    return &input_driver_st;
 }
 
-int input_event_get_osk_ptr(void)
-{
-   return input_driver_st.osk_ptr;
-}
-
-char **input_event_get_osk_grid(void)
-{
-   return input_driver_st.osk_grid;
-}
-
 /**
  * Finds first suitable joypad driver and initializes. Used as a fallback by
  * input_joypad_init_driver when no matching driver is found.
diff --git a/input/input_osk.h b/input/input_osk.h
index e7f3f79bec..717276a7ad 100644
--- a/input/input_osk.h
+++ b/input/input_osk.h
@@ -47,8 +47,6 @@ enum osk_type
    OSK_TYPE_LAST
 };
 
-int input_event_get_osk_ptr(void);
-
 void input_event_osk_append(
       input_keyboard_line_t *keyboard_line,
       enum osk_type *osk_idx,
@@ -63,8 +61,6 @@ void osk_update_last_codepoint(
       unsigned *last_codepoint_len,
       const char *word);
 
-char **input_event_get_osk_grid(void);
-
 RETRO_END_DECLS
 
 #endif
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 05189c3439..4b2e7d8fb0 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -7059,16 +7059,19 @@ static void materialui_frame(void *data, video_frame_info_t *video_info)
             video_height / 4, msg);
 
       /* Draw onscreen keyboard */
-      gfx_display_draw_keyboard(
-            p_disp,
-            userdata,
-            video_width,
-            video_height,
-            mui->textures.list[MUI_TEXTURE_KEY_HOVER],
-            mui->font_data.list.font,
-            input_event_get_osk_grid(),
-            input_event_get_osk_ptr(),
-            0xFFFFFFFF);
+      {
+         input_driver_state_t *input_st = input_state_get_ptr();
+         gfx_display_draw_keyboard(
+               p_disp,
+               userdata,
+               video_width,
+               video_height,
+               mui->textures.list[MUI_TEXTURE_KEY_HOVER],
+               mui->font_data.list.font,
+               input_st->osk_grid,
+               input_st->osk_ptr,
+               0xFFFFFFFF);
+      }
 
       /* Flush message box & osk text
        * > Message box & osk only use list font */
diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c
index 4b2e08cb8e..cab4491028 100644
--- a/menu/drivers/ozone.c
+++ b/menu/drivers/ozone.c
@@ -5563,16 +5563,19 @@ static void ozone_draw_osk(ozone_handle_t *ozone,
    }
 
    /* Keyboard */
-   gfx_display_draw_keyboard(
-         p_disp,
-         userdata,
-         video_width,
-         video_height,
-         ozone->theme->textures[OZONE_THEME_TEXTURE_CURSOR_STATIC],
-         ozone->fonts.entries_label.font,
-         input_event_get_osk_grid(),
-         input_event_get_osk_ptr(),
-         ozone->theme->text_rgba);
+   {
+      input_driver_state_t *input_st = input_state_get_ptr();
+      gfx_display_draw_keyboard(
+            p_disp,
+            userdata,
+            video_width,
+            video_height,
+            ozone->theme->textures[OZONE_THEME_TEXTURE_CURSOR_STATIC],
+            ozone->fonts.entries_label.font,
+            input_st->osk_grid,
+            input_st->osk_ptr,
+            ozone->theme->text_rgba);
+   }
 
    string_list_deinitialize(&list);
 }
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index f4c6a80764..ef783f1b7b 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -4131,8 +4131,10 @@ static void rgui_render_osk(
    unsigned osk_width, osk_height;
    unsigned osk_x, osk_y;
    
-   int osk_ptr              = input_event_get_osk_ptr();
-   char **osk_grid          = input_event_get_osk_grid();
+   input_driver_state_t 
+      *input_st             = input_state_get_ptr();
+   int osk_ptr              = input_st->osk_ptr;
+   char **osk_grid          = input_st->osk_grid;
    const char *input_str    = menu_input_dialog_get_buffer();
    const char *input_label  = menu_input_dialog_get_label_buffer();
    
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index c75d33e3ac..895d00b260 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1068,6 +1068,8 @@ static void xmb_render_messagebox_internal(
    }
 
    if (input_dialog_display_kb)
+   {
+      input_driver_state_t *input_st = input_state_get_ptr();
       gfx_display_draw_keyboard(
             p_disp,
             userdata,
@@ -1075,9 +1077,10 @@ static void xmb_render_messagebox_internal(
             video_height,
             xmb->textures.list[XMB_TEXTURE_KEY_HOVER],
             xmb->font,
-            input_event_get_osk_grid(),
-            input_event_get_osk_ptr(),
+            input_st->osk_grid,
+            input_st->osk_ptr,
             0xffffffff);
+   }
 
    string_list_deinitialize(&list);
 }