Popover fix

resolve #1434038