Add context wrapping to hotkey commands