Put shortcut disabling back in