diff --git a/web/src/components/config-form/section-configs/review.ts b/web/src/components/config-form/section-configs/review.ts
index 6f769179d..ce0d7b911 100644
--- a/web/src/components/config-form/section-configs/review.ts
+++ b/web/src/components/config-form/section-configs/review.ts
@@ -47,7 +47,7 @@ const review: SectionConfigOverrides = {
       "detections.labels": "/configuration/review/#alerts-and-detections",
     },
     restartRequired: [],
-    fieldOrder: ["alerts", "detections", "genai"],
+    fieldOrder: ["alerts", "detections", "genai", "genai.enabled"],
     fieldGroups: {},
     hiddenFields: [
       "enabled_in_config",
diff --git a/web/src/components/overlay/chip/GenAISummaryChip.tsx b/web/src/components/overlay/chip/GenAISummaryChip.tsx
index d5f7a9969..b056c36b2 100644
--- a/web/src/components/overlay/chip/GenAISummaryChip.tsx
+++ b/web/src/components/overlay/chip/GenAISummaryChip.tsx
@@ -108,7 +108,7 @@ export function GenAISummaryDialog({
   return (
     <Overlay open={open} onOpenChange={setOpen}>
       <Trigger asChild>
-        <div>{children}</div>
+        <div className="min-w-0">{children}</div>
       </Trigger>
       <Content
         className={cn(
diff --git a/web/src/components/timeline/DetailStream.tsx b/web/src/components/timeline/DetailStream.tsx
index 36df5e9f8..223c497ba 100644
--- a/web/src/components/timeline/DetailStream.tsx
+++ b/web/src/components/timeline/DetailStream.tsx
@@ -525,7 +525,7 @@ function ReviewGroup({
                       }
                     }}
                   >
-                    <span className="truncate hover:underline">
+                    <span className="block truncate hover:underline">
                       {review.data.metadata.title}
                     </span>
                   </GenAISummaryDialog>
diff --git a/web/src/lib/config-schema/transformer.ts b/web/src/lib/config-schema/transformer.ts
index eb57d4c94..797b07ee5 100644
--- a/web/src/lib/config-schema/transformer.ts
+++ b/web/src/lib/config-schema/transformer.ts
@@ -483,9 +483,20 @@ function generateUiSchema(
 
   const schemaObj = schema as Record<string, unknown>;
 
-  // Set field ordering
+  // Set field ordering — supports dot notation (e.g. "genai.enabled")
   if (fieldOrder && fieldOrder.length > 0) {
-    uiSchema["ui:order"] = [...fieldOrder, "*"];
+    const depth = currentPath.length;
+    const localOrder = fieldOrder
+      .map((f) => f.split("."))
+      .filter((segments) => {
+        if (segments.length !== depth + 1) return false;
+        return currentPath.every((p, i) => segments[i] === p);
+      })
+      .map((segments) => segments[depth]);
+
+    if (localOrder.length > 0) {
+      uiSchema["ui:order"] = [...localOrder, "*"];
+    }
   }
 
   if (!isSchemaObject(schemaObj.properties)) {