diff --git a/libs/ui-lib/lib/ocm/components/clusterWizard/ClusterWizardContextProvider.tsx b/libs/ui-lib/lib/ocm/components/clusterWizard/ClusterWizardContextProvider.tsx
index 86863ed601..cd91a69544 100644
--- a/libs/ui-lib/lib/ocm/components/clusterWizard/ClusterWizardContextProvider.tsx
+++ b/libs/ui-lib/lib/ocm/components/clusterWizard/ClusterWizardContextProvider.tsx
@@ -160,10 +160,14 @@ const ClusterWizardContextProvider = ({
         isSingleClusterFeatureEnabled,
       );
 
-      // Only move step if there is still none, or the user is at a forbidden step
+      // Only move step if there is still none, or the user is at a forbidden step.
+      // Never force the user off the custom-manifests step when they are actively filling it
+      // (e.g. after pasting content triggers auto-save and uiSettings can update).
       if (
         !currentStepId ||
-        (customManifestsStepNeedsToBeFilled && isStepAfter(currentStepId, requiredStepId))
+        (currentStepId !== 'custom-manifests' &&
+          customManifestsStepNeedsToBeFilled &&
+          isStepAfter(currentStepId, requiredStepId))
       ) {
         setCurrentStepId(requiredStepId);
       }