diff --git a/menu/widgets/menu_entry.c b/menu/widgets/menu_entry.c
index c4299fd107..e7f26d8f7f 100644
--- a/menu/widgets/menu_entry.c
+++ b/menu/widgets/menu_entry.c
@@ -482,7 +482,7 @@ int menu_entry_action(menu_entry_t *entry,
                   entry->label, entry->type, i);
          break;
       case MENU_ACTION_SEARCH:
-         menu_input_dialog_start_search(data);
+         menu_input_dialog_start_search();
          break;
 
       case MENU_ACTION_SCAN:
diff --git a/menu/widgets/menu_input_dialog.c b/menu/widgets/menu_input_dialog.c
index 79af78a1a3..1017c4c4d5 100644
--- a/menu/widgets/menu_input_dialog.c
+++ b/menu/widgets/menu_input_dialog.c
@@ -99,16 +99,16 @@ void menu_input_dialog_hide_kb(void)
    menu_input_dialog_keyboard_display = false;
 }
 
-bool menu_input_dialog_start_search(void *data)
+bool menu_input_dialog_start_search(void)
 {
-   menu_handle_t *menu = (menu_handle_t*)data;
+   menu_handle_t      *menu = NULL;
 
-   if (!menu)
+   if (!menu_driver_ctl(
+            RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
       return false;
 
    menu_input_dialog_display_kb();
-   strlcpy(menu_input_dialog_keyboard_label,
-         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SEARCH),
+   strlcpy(menu_input_dialog_keyboard_label, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SEARCH),
          sizeof(menu_input_dialog_keyboard_label));
 
    input_keyboard_ctl(RARCH_INPUT_KEYBOARD_CTL_LINE_FREE, NULL);
diff --git a/menu/widgets/menu_input_dialog.h b/menu/widgets/menu_input_dialog.h
index cb6cc8e3ca..7cc048bb4f 100644
--- a/menu/widgets/menu_input_dialog.h
+++ b/menu/widgets/menu_input_dialog.h
@@ -47,7 +47,7 @@ unsigned menu_input_dialog_get_kb_type(void);
 
 unsigned menu_input_dialog_get_kb_idx(void);
 
-bool menu_input_dialog_start_search(void *data);
+bool menu_input_dialog_start_search(void);
 
 void menu_input_dialog_hide_kb(void);