diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp
index 1b602eb1e..cd63faec4 100644
--- a/UI/ControlMappingScreen.cpp
+++ b/UI/ControlMappingScreen.cpp
@@ -264,12 +264,20 @@ void KeyMappingNewKeyDialog::key(const KeyInput &key) {
 }
 
 void KeyMappingNewKeyDialog::axis(const AxisInput &axis) {
-	// Ignore the accelerometer for mapping for now.
 	switch (axis.axisId) {
+	// Ignore the accelerometer for mapping for now.
 	case JOYSTICK_AXIS_ACCELEROMETER_X:
 	case JOYSTICK_AXIS_ACCELEROMETER_Y:
 	case JOYSTICK_AXIS_ACCELEROMETER_Z:
 		return;
+
+	// Also ignore some weird axis events we get on Ouya.
+	case JOYSTICK_AXIS_OUYA_UNKNOWN1:
+	case JOYSTICK_AXIS_OUYA_UNKNOWN2:
+	case JOYSTICK_AXIS_OUYA_UNKNOWN3:
+	case JOYSTICK_AXIS_OUYA_UNKNOWN4:
+		return;
+
 	default:
 		;
 	}