Applied the fix from popup to the popover