diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index e310e10da1..c14fe56774 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -1205,8 +1205,9 @@ static void mui_frame(void *data)
 
    if (menu_input_dialog_get_display_kb())
    {
-      const char *str = NULL, *label = NULL;
-      menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_BUFF_PTR, &str);
+      const char *label = NULL;
+      const char *str   = menu_input_dialog_get_buffer();
+
       menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_LABEL,    &label);
 
       if (!str)
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 53cbd5e319..5067944de2 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -611,9 +611,9 @@ static void rgui_render(void *data)
 
    if (menu_input_dialog_get_display_kb())
    {
-      const char *str   = NULL;
       const char *label = NULL;
-      menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_BUFF_PTR, &str);
+      const char *str   = menu_input_dialog_get_buffer();
+
       menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_LABEL,    &label);
 
       if (!str)
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 30590114aa..c55818fc87 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -2366,9 +2366,9 @@ static void xmb_frame(void *data)
 
    if (menu_input_dialog_get_display_kb())
    {
-      const char *str   = NULL;
       const char *label = NULL;
-      menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_BUFF_PTR, &str);
+      const char *str   = menu_input_dialog_get_buffer();
+
       menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_LABEL,    &label);
 
       if (!str)
diff --git a/menu/drivers/xui.cpp b/menu/drivers/xui.cpp
index eab675ffe3..d9ad4f6fb4 100644
--- a/menu/drivers/xui.cpp
+++ b/menu/drivers/xui.cpp
@@ -592,9 +592,10 @@ static void xui_render(void *data)
 
    if (display_kb)
 	{
-		char msg[1024]  = {0};
-      const char *str = NULL, *label = NULL;
-      menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_BUFF_PTR, &str);
+		char msg[1024]    = {0};
+      const char *label = NULL;
+      const char *str   = menu_input_dialog_get_buffer();
+
       menu_input_ctl(MENU_INPUT_CTL_KEYBOARD_LABEL,    &label);
 
 		if (!str)
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 42913762ca..50230d3d85 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -635,6 +635,10 @@ bool menu_input_mouse_check_vector_inside_hitbox(menu_input_ctx_hitbox_t *hitbox
    return inside_hitbox;
 }
 
+const char *menu_input_dialog_get_buffer(void)
+{
+   return *menu_input_keyboard_buffer;
+}
 
 bool menu_input_ctl(enum menu_input_ctl_state state, void *data)
 {
@@ -693,12 +697,6 @@ bool menu_input_ctl(enum menu_input_ctl_state state, void *data)
       case MENU_INPUT_CTL_UNSET_POINTER_DRAGGED:
          pointer_dragging = false;
          break;
-      case MENU_INPUT_CTL_KEYBOARD_BUFF_PTR:
-         {
-            const char **ptr = (const char**)data;
-            *ptr = *menu_input_keyboard_buffer;
-         }
-         break;
       case MENU_INPUT_CTL_KEYBOARD_LABEL:
          {
             const char **ptr = (const char**)data;
diff --git a/menu/menu_input.h b/menu/menu_input.h
index dbba03c2e0..6726891cde 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -76,7 +76,6 @@ enum menu_input_ctl_state
    MENU_INPUT_CTL_IS_POINTER_DRAGGED,
    MENU_INPUT_CTL_SET_POINTER_DRAGGED,
    MENU_INPUT_CTL_UNSET_POINTER_DRAGGED,
-   MENU_INPUT_CTL_KEYBOARD_BUFF_PTR,
    MENU_INPUT_CTL_KEYBOARD_LABEL,
    MENU_INPUT_CTL_KEYBOARD_LABEL_SETTING,
    MENU_INPUT_CTL_DEINIT,
@@ -110,6 +109,8 @@ typedef struct menu_input_ctx_line
    input_keyboard_line_complete_t cb;
 } menu_input_ctx_line_t;
 
+const char *menu_input_dialog_get_buffer(void);
+
 bool menu_input_dialog_start_search(void);
 
 void menu_input_dialog_hide_kb(void);