diff --git a/src/common/PJoystickHandler.cxx b/src/common/PJoystickHandler.cxx
index 51a79c64e..e44ea14e8 100644
--- a/src/common/PJoystickHandler.cxx
+++ b/src/common/PJoystickHandler.cxx
@@ -689,7 +689,7 @@ bool PhysicalJoystickHandler::addJoyMapping(Event::Type event, EventMode mode, i
       // erase identical mappings for all controller modes
       j->joyMap.erase(EventMode::kJoystickMode, button, axis, adir);
       j->joyMap.erase(EventMode::kPaddlesMode, button, axis, adir);
-      j->joyMap.erase(EventMode::kKeypadMode, button, axis, adir);
+      //j->joyMap.erase(EventMode::kKeypadMode, button, axis, adir); // no common buttons in keypad mode!
       j->joyMap.erase(EventMode::kCompuMateMode, button, axis, adir);
     }
     else if (evMode != EventMode::kMenuMode)