diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp
index 7919e95e2..362c06085 100644
--- a/src/input/input_manager.cpp
+++ b/src/input/input_manager.cpp
@@ -771,7 +771,7 @@ void InputManager::dispatchInput(Input::InputType type, int deviceID,
             else if (player == NULL)
             {
                 // New player is joining
-                if (action == PA_FIRE || action == PA_MENU_SELECT)
+                if (value != 0 && (action == PA_FIRE || action == PA_MENU_SELECT))
                 {
                     InputDevice *device = NULL;
                     if (type == Input::IT_KEYBOARD)