diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 79137368fa..b5acbc8156 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -263,6 +263,17 @@ int menu_driver_iterate(enum menu_action action)
    return -1;
 }
 
+static void menu_input_key_event(bool down, unsigned keycode,
+      uint32_t character, uint16_t mod)
+{
+   (void)down;
+   (void)keycode;
+   (void)mod;
+
+   if (character == '/')
+      menu_entry_action(NULL, 0, MENU_ACTION_SEARCH);
+}
+
 static void menu_driver_toggle(bool latch)
 {
    settings_t                 *settings = config_get_ptr();
@@ -319,6 +330,7 @@ static void menu_driver_toggle(bool latch)
 
       /* Restore libretro keyboard callback. */
 
+      runloop_ctl(RUNLOOP_CTL_FRONTEND_KEY_EVENT_GET, &frontend_key_event);
       runloop_ctl(RUNLOOP_CTL_KEY_EVENT_GET, &key_event);
 
       if (key_event && frontend_key_event)
diff --git a/menu/menu_input.c b/menu/menu_input.c
index f457c85160..96f3aed5df 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -156,18 +156,6 @@ void menu_input_free(void)
 {
 }
 
-
-void menu_input_key_event(bool down, unsigned keycode,
-      uint32_t character, uint16_t mod)
-{
-   (void)down;
-   (void)keycode;
-   (void)mod;
-
-   if (character == '/')
-      menu_entry_action(NULL, 0, MENU_ACTION_SEARCH);
-}
-
 static void menu_input_key_end_line(void)
 {
    bool keyboard_display    = false;
diff --git a/menu/menu_input.h b/menu/menu_input.h
index 989ffc94a5..4b04749707 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -97,10 +97,6 @@ enum menu_input_bind_mode
    MENU_INPUT_BIND_ALL
 };
 
-
-void menu_input_key_event(bool down, unsigned keycode, uint32_t character,
-      uint16_t key_modifiers);
-
 void menu_input_key_start_line(const char *label,
       const char *label_setting, unsigned type, unsigned idx,
       input_keyboard_line_complete_t cb);