Checking or unchecking weapon switching SHOULD do the trick, it did for me - perhaps something that might be of use is for you to arrange your weapon preferences by dragging them in the weapons submenu. I'm thinking that MIGHT be part of the solution in getting this to work for you because I've done that, and as I said it DOES work for me using 405b.