diff --git a/module/programplan/js/create.ui.js b/module/programplan/js/create.ui.js
index 5b45f14b51..026f8182d5 100644
--- a/module/programplan/js/create.ui.js
+++ b/module/programplan/js/create.ui.js
@@ -83,13 +83,7 @@ window.onRenderRow = function(row, rowIdx, data)
         }
     }
 
-    if(!data || !data.planIDList) return;
-
-    row.children('.form-batch-row-actions').children('[data-type=delete]').addClass('hidden');
-    row.children('[data-name=type]').children('select').attr('disabled', 'disabled');
-
-    /* Use the flag variable 'setMilestone' to toggle the enable/disable status of the milestone field. */
-    if(!data.setMilestone)
+    if(data != undefined && data.disabled)
     {
         let name  = '';
         let value = '';
@@ -113,6 +107,10 @@ window.onRenderRow = function(row, rowIdx, data)
         inputEle.setAttribute('type',  'hidden');
         row.children('[data-name=milestone]').append(inputEle);
     }
+    if(!data || !data.planIDList) return;
+
+    row.children('.form-batch-row-actions').children('[data-type=delete]').addClass('hidden');
+    row.children('[data-name=type]').children('select').attr('disabled', 'disabled');
 };
 
 window.onChangeExecutionType = function(event)
diff --git a/module/programplan/ui/create.html.php b/module/programplan/ui/create.html.php
index f10e9e9b5e..c00934f46f 100644
--- a/module/programplan/ui/create.html.php
+++ b/module/programplan/ui/create.html.php
@@ -234,7 +234,7 @@ $fnGenerateDefaultData = function() use ($config, $plans, $planID, $stages, $exe
         $points = !empty($enabledPoints->{$plan->attribute}) ? $enabledPoints->{$plan->attribute} : array();
 
         $item               = new stdClass();
-        $item->disabled     = !isset($plan->setMilestone);
+        $item->disabled     = $plan->type != 'stage';
         $item->enabled      = $plan->enabled;
         $item->id           = $plan->id;
         $item->type         = $plan->type;