Fix more hotkey nonsense

Come on.