Perhaps.
In retrospect I can probably also make it so that it optionally gives a 'switch' option at the top of the equipment list when you select the weapon, much like the 'remove' option in EquipCore.
I'll see what I can do on my backshifts in the next couple of days.