Fixed regression on popup