Fixed popup click issue