Fixed pin popups, refs #476