Adjusted bug with the external popup