Add support for shortcut keys.
Fix issues with context changing after shortcut support.