diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 9c42b35ec..f0c351f61 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,8 @@
+September 19, 2008
+- Fixed: When UpdateJoystickMenu() modifies the menu items for different
+  controllers, the joystick axis selectors need to NULL the d.graycheck
+  field, since this is shared by the axis sensitivity sliders' step values.
+
 September 19, 2008  (Changes by Graf Zahl)
 - Fixed: The crosshair must be initialized after the texture manager because
   on the fly texture creation for graphics patches is no longer supported.
diff --git a/src/m_options.cpp b/src/m_options.cpp
index 09b9af641..0e20c5f9d 100644
--- a/src/m_options.cpp
+++ b/src/m_options.cpp
@@ -2976,6 +2976,7 @@ void UpdateJoystickMenu ()
 				JoystickItems[line].type = discrete;
 				JoystickItems[line].a.intcvar = cvars[i];
 				JoystickItems[line].b.numvalues = 6.f;
+				JoystickItems[line].d.graycheck = NULL;
 				JoystickItems[line].e.values = JoyAxisMapNames;
 				line++;
 			}