fixed popup mouseover issue
resolved conflict
Merge pull request #1593 from nutan-gooru/dev-branch

Fixed popup mouseover issue