Fix popover and index list Refs #0028884