Close #309 -- Fix problem with missing popover after annotation selection.