Fix pop-ups

#77 caused reversion in pop-ups