Well, you can still always unequip the shield yourself. I guess the shield stays equiped, even though it's not, so that next time you want to equip a one handed weapon, you'll know what shield you last used.

Tovi May Raan refresh you!