diff --git a/packages/ui/src/features/loops/components/LoopBehaviorFields.tsx b/packages/ui/src/features/loops/components/LoopBehaviorFields.tsx
new file mode 100644
index 0000000000..935185a321
--- /dev/null
+++ b/packages/ui/src/features/loops/components/LoopBehaviorFields.tsx
@@ -0,0 +1,44 @@
+import type { LoopSchemas } from "@posthog/api-client/loops";
+import { Switch } from "@posthog/quill";
+import { Flex, Text } from "@radix-ui/themes";
+import { isAutoFixEnabled, withAutoFix } from "../loopFormTypes";
+
+interface LoopBehaviorFieldsProps {
+  behaviors: LoopSchemas.LoopBehaviors;
+  onChange: (behaviors: LoopSchemas.LoopBehaviors) => void;
+  disabled?: boolean;
+}
+
+export function LoopBehaviorFields({
+  behaviors,
+  onChange,
+  disabled,
+}: LoopBehaviorFieldsProps) {
+  return (
+    <Flex
+      direction="column"
+      gap="2"
+      className="rounded-(--radius-2) border border-border bg-(--color-panel-solid) p-3"
+    >
+      <Flex align="center" justify="between" gap="2">
+        <Flex direction="column" gap="0">
+          <Text className="font-medium text-[13px] text-gray-12">
+            Auto-fix pull requests
+          </Text>
+          <Text className="text-[12px] text-gray-10">
+            Watch CI and review comments on PRs this loop opens, and let Claude
+            push fixes.
+          </Text>
+        </Flex>
+        <Switch
+          checked={isAutoFixEnabled(behaviors)}
+          disabled={disabled}
+          aria-label="Auto-fix pull requests"
+          onCheckedChange={(checked) =>
+            onChange(withAutoFix(behaviors, checked))
+          }
+        />
+      </Flex>
+    </Flex>
+  );
+}
diff --git a/packages/ui/src/features/loops/components/LoopForm.tsx b/packages/ui/src/features/loops/components/LoopForm.tsx
index f7e26acae0..15647e6f73 100644
--- a/packages/ui/src/features/loops/components/LoopForm.tsx
+++ b/packages/ui/src/features/loops/components/LoopForm.tsx
@@ -21,11 +21,13 @@ import { useLoopDraftStore } from "../loopDraftStore";
 import {
   emptyLoopFormValues,
   formValuesToLoopWrite,
+  isAutoFixEnabled,
   isLoopFormValid,
   isTriggerDraftValid,
   type LoopFormValues,
   loopToFormValues,
 } from "../loopFormTypes";
+import { LoopBehaviorFields } from "./LoopBehaviorFields";
 import { Field } from "./LoopFormPrimitives";
 import { LoopModelFields } from "./LoopModelFields";
 import { LoopNotificationsFields } from "./LoopNotificationsFields";
@@ -230,6 +232,16 @@ export function LoopForm({ loop }: LoopFormProps) {
 
               <Divider />
 
+              <Field label="Behavior">
+                <LoopBehaviorFields
+                  behaviors={values.behaviors}
+                  disabled={isSubmitting}
+                  onChange={(behaviors) => patch({ behaviors })}
+                />
+              </Field>
+
+              <Divider />
+
               <Field label="Notifications">
                 <LoopNotificationsFields
                   notifications={values.notifications}
@@ -358,9 +370,8 @@ function Stepper({
       {STEPS.map((label, index) => {
         const isCurrent = index === current;
         const isDone = index < current && complete[index];
-        // Free navigation back to any earlier step; forward only into the step
-        // immediately after a completed one, so you can't skip required fields.
-        const reachable = index <= current || complete[index - 1];
+        // Steps navigate freely in both directions; skipping ahead is safe
+        // because Next stays gated per step and Create on the whole form.
         return (
           <Flex
             key={label}
@@ -369,9 +380,8 @@ function Stepper({
           >
             <button
               type="button"
-              disabled={!reachable}
               onClick={() => onSelect(index)}
-              className="flex min-w-0 items-center gap-2 disabled:cursor-not-allowed"
+              className="flex min-w-0 cursor-pointer items-center gap-2"
             >
               <Flex
                 align="center"
@@ -473,6 +483,10 @@ function ReviewList({ values }: { values: LoopFormValues }) {
             : values.triggers.map(describeTrigger).join(", ")
         }
       />
+      <ReviewRow
+        label="Auto-fix PRs"
+        value={isAutoFixEnabled(values.behaviors) ? "On" : "Off"}
+      />
       <ReviewRow
         label="Notifications"
         value={channels.length === 0 ? "None" : channels.join(", ")}
diff --git a/packages/ui/src/features/loops/loopFormTypes.ts b/packages/ui/src/features/loops/loopFormTypes.ts
index 04cf31003e..5f0a33360c 100644
--- a/packages/ui/src/features/loops/loopFormTypes.ts
+++ b/packages/ui/src/features/loops/loopFormTypes.ts
@@ -31,6 +31,7 @@ export interface LoopFormValues {
    */
   repositories: LoopSchemas.LoopRepositoryEntry[];
   triggers: LoopTriggerDraft[];
+  behaviors: LoopSchemas.LoopBehaviors;
   notifications: LoopSchemas.LoopNotifications;
 }
 
@@ -51,6 +52,30 @@ export function defaultLoopNotifications(): LoopSchemas.LoopNotifications {
   return { push: { ...off }, email: { ...off }, slack: { ...off } };
 }
 
+export function defaultLoopBehaviors(): LoopSchemas.LoopBehaviors {
+  return {
+    create_prs: true,
+    watch_ci: false,
+    fix_review_comments: false,
+    max_fix_iterations: 3,
+  };
+}
+
+/** The single "Auto-fix pull requests" toggle drives both CI-watching and
+ * review-comment fixing; it reads as on only when both are on. */
+export function isAutoFixEnabled(
+  behaviors: LoopSchemas.LoopBehaviors,
+): boolean {
+  return behaviors.watch_ci && behaviors.fix_review_comments;
+}
+
+export function withAutoFix(
+  behaviors: LoopSchemas.LoopBehaviors,
+  enabled: boolean,
+): LoopSchemas.LoopBehaviors {
+  return { ...behaviors, watch_ci: enabled, fix_review_comments: enabled };
+}
+
 let draftKeySeq = 0;
 
 export function nextDraftTriggerKey(): string {
@@ -69,6 +94,7 @@ export function emptyLoopFormValues(): LoopFormValues {
     reasoningEffort: null,
     repositories: [],
     triggers: [],
+    behaviors: defaultLoopBehaviors(),
     notifications: defaultLoopNotifications(),
   };
 }
@@ -90,6 +116,7 @@ export function loopToFormValues(loop: LoopSchemas.Loop): LoopFormValues {
       enabled: trigger.enabled,
       config: trigger.config,
     })),
+    behaviors: loop.behaviors,
     notifications: loop.notifications,
   };
 }
@@ -112,6 +139,7 @@ export function formValuesToLoopWrite(
       enabled: trigger.enabled,
       config: trigger.config,
     })),
+    behaviors: values.behaviors,
     notifications: values.notifications,
   };
 }