Part of #327: Fix hotkey