[BUGFIX] Simplify shortcut handling