JBIDE-18302 VPV does not stick on currently selected widget

includes #280 and hack for Mac