Improve popover timings