Better popover handling