Hopefully fixed double popup