Yea that part is annoying for no good reason. I wish they would just let you upgrade the weapon without having to unequip it.