diff --git a/packages/ui/src/features/loops/components/LoopForm.tsx b/packages/ui/src/features/loops/components/LoopForm.tsx
index 7361bd3596..93b1b3f485 100644
--- a/packages/ui/src/features/loops/components/LoopForm.tsx
+++ b/packages/ui/src/features/loops/components/LoopForm.tsx
@@ -446,8 +446,8 @@ function Stepper({
       {STEPS.map((label, index) => {
         const isCurrent = index === current;
         const isDone = index < current && complete[index];
-        // Steps navigate freely in both directions; skipping ahead is safe
-        // because Next stays gated per step and Create on the whole form.
+        const canSelect =
+          index <= current || complete.slice(current, index).every(Boolean);
         return (
           <Flex
             key={label}
@@ -456,8 +456,11 @@ function Stepper({
           >
             <button
               type="button"
-              onClick={() => onSelect(index)}
-              className="flex min-w-0 cursor-pointer items-center gap-2"
+              disabled={!canSelect}
+              onClick={() => {
+                if (canSelect) onSelect(index);
+              }}
+              className="flex min-w-0 cursor-pointer items-center gap-2 disabled:cursor-not-allowed disabled:opacity-50"
             >
               <Flex
                 align="center"