Reverted to standard Popup to get multi-feature handling