Fix beacon lock to include hotkey swap events