Yeah, I think Leek wrote the disarm-disablement code to cover too many item types. I've toned it back down to just weapons for now whilst waiting for Fen to confirm how he wants it to work, which is the easiest way to fix this - if disarmed doesn't stop you switching shields, the use button won't show up when you select a shield and voila.