diff --git a/menu/menu_event.c b/menu/menu_event.c
index 31852a4de0..a0352cd51c 100644
--- a/menu/menu_event.c
+++ b/menu/menu_event.c
@@ -217,7 +217,7 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
 
    for (i = 0; i < RETROK_LAST; i++)
    {
-      if (i == RETROK_F1)
+      if (i == RETROK_F1 || i == RETROK_F11)
          continue;
 
       if (menu_keyboard_key_state[i])
@@ -230,9 +230,6 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
             case RETROK_f:
                BIT32_SET(trigger_input, RARCH_FULLSCREEN_TOGGLE_KEY);
                break;
-            case RETROK_F11:
-               BIT32_SET(trigger_input, RARCH_GRAB_MOUSE_TOGGLE);
-               break;
             case RETROK_PAGEUP:
                BIT32_SET(trigger_input, settings->menu_scroll_up_btn);
                break;
@@ -299,8 +296,11 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
    if (runloop_cmd_triggered(trigger_input, RARCH_FULLSCREEN_TOGGLE_KEY))
       command_event(CMD_EVENT_FULLSCREEN_TOGGLE, NULL);
 
-   if (runloop_cmd_triggered(trigger_input, RARCH_GRAB_MOUSE_TOGGLE))
+   if (menu_keyboard_key_state[RETROK_F11])
+   {
       command_event(CMD_EVENT_GRAB_MOUSE_TOGGLE, NULL);
+      menu_keyboard_key_state[RETROK_F11] = false;
+   }
 
    if (runloop_cmd_press(trigger_input, RARCH_QUIT_KEY))
    {