make sure to handle popup with screens