Can't easily switch between gadgets and primary weapon on PC

Hello, I'm having an issue with keybindings in BF2042.  I have my gadgets set to my Mouse 2 and Mouse 4 buttons.  In all previous Battlefield games I've played (this includes BF3, BF4, BF:H, and BFV), when you press one of these buttons once it will switch to their respective gadget.  If you press it again it will switch BACK to your primary weapon.  This is the way it ALWAYS worked before. 

Now, if I press the button a second time it does nothing.  If I spin the scroll wheel it actually goes to my SECONDARY weapon, and NOT my primary.  Please fix this, as it really ruins the flow and has gotten my killed numerous times.  Every other BF game worked like I described.  I have no idea why this doesn't work anymore.  This is a basic QoL issue.  Thank you for your time.