Quit on escape

Change-Id: I251e7278b3a399ca85c3777a491e17e40caa3d3b