Fix popup scopes