Fixing issue #1100, the popovers for point selection doesn't close properly