Minor changes in popover

Please let met know if I broke something, by giving me a reproducible case.