- popup don't work with map
- improve popup visible logic

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>