Popup focus fixes