This actually isn't a minor convenience issue, either. If you have your ranged weapon equipped during combat and aren't able to switch back to melee, you can't use an attack of opportunity if something runs by you. If you've used all your actions by the end of the turn, there's no way to switch it back, but with keyboard/mouse you can just press F and be all set. This definitely needs a fix. I'd rather lose out on the quick light source switch if it means being able to swap melee/ranged at will.
