diff --git a/module/project/model.php b/module/project/model.php
index c4e52400f6..733420ee2d 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1347,6 +1347,13 @@ class projectModel extends model
                 $title  = "title='{$project->name}'";
             }
 
+            if($id == 'end')
+            {
+                $project->end = $project->end == LONG_TIME ? $this->lang->project->longTime : $project->end;
+                $class .= ' c-name';
+                $title  = "title='{$project->end}'";
+            }
+
             if($id == 'budget')
             {
                 $projectBudget = in_array($this->app->getClientLang(), ['zh-cn','zh-tw']) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);
@@ -1390,7 +1397,7 @@ class projectModel extends model
                     echo $project->begin;
                     break;
                 case 'end':
-                    echo $project->end == LONG_TIME ? $this->lang->project->longTime : $project->end;
+                    echo $project->end;
                     break;
                 case 'status':
                     echo "<span class='status-task status-{$project->status}'> " . zget($this->lang->project->statusList, $project->status) . "</span>";
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index bae7c19025..567dd9d69a 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -60,7 +60,7 @@
               <?php $placeholder = ($parentProgram and $parentProgram->budget != 0) ? 'placeholder=' . $lang->project->parentBudget . zget($lang->project->currencySymbol, $parentProgram->budgetUnit) . $availableBudget : '';?>
               <?php echo html::input('budget', $project->budget != 0 ? $project->budget : '', "class='form-control' " . (strpos($requiredFields, 'budget') !== false ? 'required ' : '') . ($project->budget == 0 ? 'disabled ' : '') . $placeholder);?>
               <?php if($parentProgram):?>
-              <span class='input-group-addon'><?php echo zget($budgetUnitList, $parentProgram->budgetUnit);?></span>
+              <span class='input-group-addon'><?php echo zget($budgetUnitList, $project->budgetUnit);?></span>
               <?php else:?>
               <span class='input-group-addon'></span>
               <?php echo html::select('budgetUnit', $budgetUnitList, $project->budgetUnit, "class='form-control'");?>