Close the window with esc aswell
Merge branch 'close-window-with-esc'