POPS-268 fixed issue with modal popup showing