Weapon swap fix

If I have my primary weapon out and switch to a gadget, if I then try to switch back to a weapon, it switches to my secondary instead of my primary. This has caused me to die a number of times. Can we have it so when you switch off your gadget that it switches back to your previously held weapon?