CMS-3740 Make ESC return you to application