Don't make multiple magnified popups of images

Currently if you click on an image, sometimes it is positioned such that the popup magnified version is not covering the original. And then you may click the original again creating a second popup. But you are unaware a second one popped up because it aligns perfectly over the first. Then there is confusion when you click to dismiss the popup but it appears to not go away.