diff --git a/code/io/joy.h b/code/io/joy.h
index 7ee6e259f3b..ce4cd7cfca1 100644
--- a/code/io/joy.h
+++ b/code/io/joy.h
@@ -17,7 +17,7 @@
 #include "SDL_joystick.h"
 
 // z64: Moved up here for compatibility. Bye bye, organization!
-const int JOY_NUM_BUTTONS = 32;	// Max number of buttons FSO can handle.  OS max may differ.
+const int JOY_NUM_BUTTONS = 128;	// Max number of buttons FSO can handle.  OS max may differ.
 const int JOY_NUM_HAT_POS = 4;
 const int JOY_TOTAL_BUTTONS = (JOY_NUM_BUTTONS + JOY_NUM_HAT_POS);