FIX: Proper detecting of hiding popover
Merge branch 'bugs'