Directory popover fixes