Bug fix for Pop up window.