Fixing Popover Close Button issue