Feral Druid DBW shapeshift proc disappears after changing form

Hi, I play as a feral Druid and I just love it when DBW proccs and we transform into a badass tauren or valkyrie for 30 seconds, the trouble iv experienced though is quite depressing, because if I shapeshift inbetween the DBW procc, I lose the DBW shapeshift, even thought the trinket procc is still up.

I noticed on Arena Tournament it doesnt happen, so I assume there is a fix for it. There is nothing cooler than a Feral cat shapeshifted into a badass tauren or valkyrie. All ferals who run with a DBW, please share your opinion on the topic.