Issue #186: Improve behaviour of Ctrl+[ and Ctrl+]