Fixed issue with Escape button