Fix autopopup

Better auto popup, check every screen pls