diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/button_group.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/button_group.tsx
index 1bcaa80deef6d..6722ac17443ae 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/button_group.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/button_group.tsx
@@ -46,6 +46,7 @@ export const ButtonGroup: React.FC<Props> = ({ onChange, options, selected }) =>
             'buttonGroupOption--selected': isSelected,
           })}
           grow={false}
+          key={index}
           onClick={() => {
             onChange(option);
           }}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/name_and_description_stats.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/name_and_description_stats.tsx
index 3c5b44f6f571a..236a731b43069 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/name_and_description_stats.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/name_and_description_stats.tsx
@@ -52,14 +52,17 @@ export const NameAndDescriptionStats: React.FC = () => {
       description: <EditDescription label={NAME_LABEL} onClick={() => setIsFlyoutVisible(true)} />,
       isLoading: hideStats,
       title: indexData.connector.name,
+      descriptionElement: 'div',
+      titleElement: 'div',
     },
     {
       description: (
         <EditDescription label={DESCRIPTION_LABEL} onClick={() => setIsFlyoutVisible(true)} />
       ),
+      descriptionElement: 'div',
       isLoading: hideStats,
       title: <EuiText size="s">{indexData.connector.description || ''}</EuiText>,
-      titleElement: 'p',
+      titleElement: 'div',
     },
   ];
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/pipeline_json_badges.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/pipeline_json_badges.tsx
index 9a690ab437dab..16365012003b0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/pipeline_json_badges.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/pipeline_json_badges.tsx
@@ -131,17 +131,17 @@ export const PipelineJSONBadges: React.FC = () => {
   }
   const badges: JSX.Element[] = [];
   if (isManagedPipeline(pipeline)) {
-    badges.push(<ManagedPipelineBadge />);
+    badges.push(<ManagedPipelineBadge key="managed-pipeline" />);
   } else {
-    badges.push(<UnmanagedPipelineBadge />);
+    badges.push(<UnmanagedPipelineBadge key="unmanaged-pipeline" />);
   }
   if (pipelineName === DEFAULT_PIPELINE_NAME) {
-    badges.push(<SharedPipelineBadge />);
+    badges.push(<SharedPipelineBadge key="shared-pipeline" />);
   }
   if (pipelineName?.endsWith('@ml-inference')) {
-    badges.push(<MlInferenceBadge />);
+    badges.push(<MlInferenceBadge key="inference-pipeline" />);
   } else if (pipelineName?.includes(indexName)) {
-    badges.push(<IndexPipelineBadge />);
+    badges.push(<IndexPipelineBadge key="index-pipeline" />);
   }
   return <EuiBadgeGroup gutterSize="s">{badges}</EuiBadgeGroup>;
 };