This is driving me nuts!

The only way to make the katana auto equip after tossing knives is to un-equip one knife- but then I have to pass through unarmed to get to it.

Is there ANY way to fix this?