diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/MilestoneAutomation.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/MilestoneAutomation.tsx
index 4b2d520903..0da49b965c 100644
--- a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/MilestoneAutomation.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/MilestoneAutomation.tsx
@@ -36,12 +36,6 @@ const StyledAddAutomationButton = styled(Button)(({ theme }) => ({
     },
 }));
 
-const StyledAddAutomationContainer = styled('div')(({ theme }) => ({
-    display: 'flex',
-    alignItems: 'center',
-    gap: theme.spacing(1),
-}));
-
 interface MilestoneAutomationProps {
     milestone: IReleasePlanMilestone;
     status: MilestoneStatus;
@@ -82,8 +76,6 @@ export const MilestoneAutomation = ({
         return null;
     }
 
-    const hasPendingCreate =
-        pendingProgressionChange?.action === 'createMilestoneProgression';
     const hasPendingChange =
         pendingProgressionChange?.action === 'changeMilestoneProgression';
     const hasPendingDelete =
@@ -117,18 +109,13 @@ export const MilestoneAutomation = ({
                     badge={badge}
                 />
             ) : (
-                <StyledAddAutomationContainer>
-                    <StyledAddAutomationButton
-                        onClick={onOpenProgressionForm}
-                        color='primary'
-                        startIcon={<Add />}
-                    >
-                        Add automation
-                    </StyledAddAutomationButton>
-                    {hasPendingCreate && (
-                        <Badge color='warning'>Modified in draft</Badge>
-                    )}
-                </StyledAddAutomationContainer>
+                <StyledAddAutomationButton
+                    onClick={onOpenProgressionForm}
+                    color='primary'
+                    startIcon={<Add />}
+                >
+                    Add automation
+                </StyledAddAutomationButton>
             )}
         </MilestoneAutomationSection>
     );
diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/ReleasePlanMilestoneItem.tsx b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/ReleasePlanMilestoneItem.tsx
index eaff57ffdc..cdfc7401c4 100644
--- a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/ReleasePlanMilestoneItem.tsx
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/ReleasePlanMilestoneItem.tsx
@@ -97,7 +97,8 @@ export const ReleasePlanMilestoneItem = ({
                     sourceMilestone: milestone.id,
                 },
             });
-            return { shouldReset: true };
+            handleCloseProgressionForm();
+            return {};
         }
 
         try {
diff --git a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/pendingProgressionChanges.ts b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/pendingProgressionChanges.ts
index f37c6d3788..3d5c4a6f7d 100644
--- a/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/pendingProgressionChanges.ts
+++ b/frontend/src/component/feature/FeatureView/FeatureOverview/ReleasePlan/ReleasePlanMilestoneItem/pendingProgressionChanges.ts
@@ -15,10 +15,10 @@ export const getPendingProgressionData = (
 ): PendingProgressionChangeResult => {
     const pendingProgressionChange = getPendingProgressionChange(milestone.id);
 
-    // Determine effective transition condition (use pending create if exists)
+    // Determine effective transition condition (use pending change if exists)
     let effectiveTransitionCondition = milestone.transitionCondition;
     if (
-        pendingProgressionChange?.action === 'createMilestoneProgression' &&
+        pendingProgressionChange?.action === 'changeMilestoneProgression' &&
         'transitionCondition' in pendingProgressionChange.payload &&
         pendingProgressionChange.payload.transitionCondition
     ) {