Fix issue with Eval/Visual Comparison popups not being accessible on second consecutive click.

@fbeninca This is an old one that didn't get merged. I think it was finished right before the last release and we didn't want to do a last minute merge.