diff --git a/menu/menu_input.c b/menu/menu_input.c
index 8bd5f0b685..3bfc5b5de2 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -681,6 +681,17 @@ int menu_input_key_bind_set_mode(void *data,
    if (menu_input_key_bind_set_mode_common(setting, type) == -1)
       return -1;
 
+   switch (settings->input.bind_mode)
+   {
+      case 0:
+         break;
+      case 1:
+         joypad_pressed = false;
+         break;
+      case 2:
+         joypad_pressed = true;
+         break;
+   }
 
    if (joypad_pressed)
    {