diff --git a/src/SFML/Window/JoystickImpl.hpp b/src/SFML/Window/JoystickImpl.hpp
index 65ec74d56..b9df3c1c7 100644
--- a/src/SFML/Window/JoystickImpl.hpp
+++ b/src/SFML/Window/JoystickImpl.hpp
@@ -33,6 +33,8 @@
 
 #include <SFML/System/EnumArray.hpp>
 
+#include <bitset>
+
 
 namespace sf::priv
 {
@@ -55,7 +57,7 @@ struct JoystickState
 {
     bool                                                  connected{}; //!< Is the joystick currently connected?
     EnumArray<Joystick::Axis, float, Joystick::AxisCount> axes{};      //!< Position of each axis, in range [-100, 100]
-    std::array<bool, Joystick::ButtonCount>               buttons{};   //!< Status of each button (true = pressed)
+    std::bitset<Joystick::ButtonCount>                    buttons;     //!< Status of each button (true = pressed)
 };
 
 } // namespace sf::priv