[TASK] Adapt to changes in shortcut handling
Merge pull request #512 from bjo3rnf/shorty

[TASK] Adapt to changes in shortcut handling