Yet another popup fix.