Fixing issues with shortcut keys