Fix UI issue for comment popover