diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp
index ffcda5942b..7b57be6607 100644
--- a/UI/ControlMappingScreen.cpp
+++ b/UI/ControlMappingScreen.cpp
@@ -222,11 +222,6 @@ void KeyMappingNewKeyDialog::key(const KeyInput &key) {
 			return;
 		}
 
-		if (key.keyCode == NKCODE_ESCAPE) {
-			screenManager()->finishDialog(this, DR_CANCEL);
-			return;
-		}
-		
 		KeyDef kdf(key.deviceId, key.keyCode);
 		screenManager()->finishDialog(this, DR_OK);
 		if (callback_)