diff --git a/src/common/PJoystickHandler.cxx b/src/common/PJoystickHandler.cxx
index f888b4efa..7ff32a697 100644
--- a/src/common/PJoystickHandler.cxx
+++ b/src/common/PJoystickHandler.cxx
@@ -327,6 +327,7 @@ void PhysicalJoystickHandler::defineControllerMappings(const Controller::Type ty
   switch(type)
   {
     case Controller::Type::Keyboard:
+    case Controller::Type::KidVid:
       if(port == Controller::Jack::Left)
         myLeftMode = EventMode::kKeypadMode;
       else
diff --git a/src/common/PKeyboardHandler.cxx b/src/common/PKeyboardHandler.cxx
index f669b0916..03a939579 100644
--- a/src/common/PKeyboardHandler.cxx
+++ b/src/common/PKeyboardHandler.cxx
@@ -145,6 +145,7 @@ void PhysicalKeyboardHandler::defineControllerMappings(const Controller::Type ty
   switch(type)
   {
     case Controller::Type::Keyboard:
+    case Controller::Type::KidVid:
       if(port == Controller::Jack::Left)
         myLeftMode = EventMode::kKeypadMode;
       else
diff --git a/src/emucore/KidVid.cxx b/src/emucore/KidVid.cxx
index 5d6f02306..77a280122 100644
--- a/src/emucore/KidVid.cxx
+++ b/src/emucore/KidVid.cxx
@@ -66,7 +66,7 @@ void KidVid::update()
     myTape = 0; // rewind Kid Vid tape
     closeSampleFile();
   }
-  if(myEvent.get(Event::KeyboardZero1))
+  if(myEvent.get(Event::KeyboardOne1))
   {
     myTape = 2;
     myIdx = myGame == KVBBEARS ? KVBLOCKBITS : 0;
@@ -75,7 +75,7 @@ void KidVid::update()
     openSampleFile();
 cerr << "myTape = " << myTape << endl;
   }
-  else if(myEvent.get(Event::KeyboardZero2))
+  else if(myEvent.get(Event::KeyboardOne2))
   {
     myTape = 3;
     myIdx = myGame == KVBBEARS ? KVBLOCKBITS : 0;
@@ -84,7 +84,7 @@ cerr << "myTape = " << myTape << endl;
     openSampleFile();
 cerr << "myTape = " << myTape << endl;
   }
-  else if(myEvent.get(Event::KeyboardZero3))
+  else if(myEvent.get(Event::KeyboardOne3))
   {
     if(myGame == KVBBEARS)  /* Berenstain Bears ? */
     {