diff --git a/parts/scenes/app_cmd.lua b/parts/scenes/app_cmd.lua
index 0cc2db2e..efe8dc1b 100644
--- a/parts/scenes/app_cmd.lua
+++ b/parts/scenes/app_cmd.lua
@@ -697,6 +697,12 @@ function scene.keyDown(k)
 		end
 	elseif combKey[k]and kb.isDown("lctrl","rctrl")then
 		combKey[k]()
+	elseif k=="escape"then
+		if WIDGET.sel~=inputBox then
+			WIDGET.sel=inputBox
+		else
+			SCN.back()
+		end
 	else
 		if WIDGET.sel~=inputBox then WIDGET.sel=inputBox end
 		WIDGET.keyPressed(k)