[TASK] Adapt to changes in shortcut handling