diff --git a/src/SFML/Window/Input.cpp b/src/SFML/Window/Input.cpp
index 87c91b04..d6ef8f43 100644
--- a/src/SFML/Window/Input.cpp
+++ b/src/SFML/Window/Input.cpp
@@ -76,7 +76,7 @@ bool Input::IsMouseButtonDown(Mouse::Button button) const
 ////////////////////////////////////////////////////////////
 bool Input::IsJoystickButtonDown(unsigned int joystick, unsigned int button) const
 {
-    if ((joystick < 2) && (button < 32))
+    if ((joystick < 4) && (button < 32))
         return myJoystickButtons[joystick][button];
     else
         return false;