Slightly more permanent fix for hotkeys