Fixed: refactoring of the escape feature of the panel and popover