If you have no weapon equipped the CharacterWeaponADS and CharacterFire action should not remove (put away) the currently held gadget.
The real left click "put away" action (GadgetCancel) should be the only thing that affects this (with no weapon equipped).