Fix popup scroll issue
Fix popup scroll issue