enhance popup

It was buggy on my browser
Merge pull request #135 from bitzesty/enhance-popup

enhance popup