diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index 5322671010..2c4061f2de 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -248,6 +248,7 @@ void ScreenMapControllers::Input( const DeviceInput& DeviceI, const InputEventTy
 			}
 			break;
 		case SDLK_RETURN: /* Change the selection. */
+		case SDLK_KP_ENTER:
 			m_bWaitingForPress = true;	
 			break;
 		}
diff --git a/stepmania/src/ScreenTextEntry.cpp b/stepmania/src/ScreenTextEntry.cpp
index 0cefdb09bb..a57b468ae5 100644
--- a/stepmania/src/ScreenTextEntry.cpp
+++ b/stepmania/src/ScreenTextEntry.cpp
@@ -108,6 +108,7 @@ void ScreenTextEntry::Input( const DeviceInput& DeviceI, const InputEventType ty
 		MenuStart(PLAYER_1);
 		break;
 	case SDLK_RETURN:
+	case SDLK_KP_ENTER:
 		MenuStart(PLAYER_1);
 		break;
 	case SDLK_BACKSPACE: