diff --git a/src/platform/packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/recommended_queries/suggestions.ts b/src/platform/packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/recommended_queries/suggestions.ts
index 44e7e047758e5..41e96c4fb2837 100644
--- a/src/platform/packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/recommended_queries/suggestions.ts
+++ b/src/platform/packages/shared/kbn-esql-validation-autocomplete/src/autocomplete/recommended_queries/suggestions.ts
@@ -51,7 +51,8 @@ export const mapRecommendedQueriesFromExtensions = (
     return {
       label: extension.name,
       text: extension.query,
-      detail: extension.description ?? '',
+      detail: extension.name ?? '',
+      ...(extension.description ? { documentation: { value: extension.description } } : {}),
       kind: 'Issue',
       sortText: 'D',
     };
@@ -82,7 +83,10 @@ export const getRecommendedQueriesTemplatesFromExtensions = (
       return {
         label: recommendedQuery.name,
         text: `|${queryParts.slice(1).join('|')}`,
-        detail: recommendedQuery.description ?? '',
+        detail: recommendedQuery.name ?? '',
+        ...(recommendedQuery.description
+          ? { documentation: { value: recommendedQuery.description } }
+          : {}),
         kind: 'Issue',
         sortText: 'D',
       };