Fixed the double pop-up window