Fix setting popover overlap