Bugfix: shortcuts were not applied when loading