Toggles and Kheldian Shapeshifting

[White Warlock]

I am not sure how feasible this is but would it be possible to get the kheldian shield toggles to suppress rather than drop outright when shapeshifting?

 

Whilst it is not an issue for those running perma-lightform/eclipse, when leveling I have found that dropping from dwarf/nova to human currently has a window where you are sat there toggling shields back on, especially if you have aggro at the time, which makes combat-shifting less fluid than perhaps it could be.