Changed focussing behaviour in the popup