Put disabling existing shortcuts into its own function (related to issue
6991)