Quick fix on popover after refactoring