diff --git a/module/program/js/common.ui.js b/module/program/js/common.ui.js
index 755d7255e8..c425e22478 100644
--- a/module/program/js/common.ui.js
+++ b/module/program/js/common.ui.js
@@ -109,6 +109,8 @@ function computeEndDate(delta)
         $end.$.setDate('');
         $end.render({disabled: true});
         outOfDateTip();
+        $('#end').addClass('hidden');
+        $('#end').next().removeClass('hidden');
         return false;
     }
 
@@ -121,9 +123,13 @@ function computeEndDate(delta)
         delta = (weekend == 2) ? (delta - 2) : (delta - 1);
     }
 
+    $('#end').removeClass('hidden');
+    $('#end').next().addClass('hidden');
+
     const endDate = zui.formatDate(zui.addDate(beginDate, delta - 1), 'yyyy-MM-dd');
-    $end.$.setDate(endDate);
+    $end.$.setValue(endDate);
     computeWorkDays();
+
 }
 
 /**
diff --git a/module/program/ui/create.html.php b/module/program/ui/create.html.php
index a46886837c..d5e58b0582 100644
--- a/module/program/ui/create.html.php
+++ b/module/program/ui/create.html.php
@@ -110,6 +110,16 @@ formPanel
                     set::required(true),
                     set::value(''),
                     on::change('computeWorkDays')
+                ),
+                inputControl
+                (
+                    setClass('has-suffix-icon w-full hidden'),
+                    to::suffix(icon('calendar')),
+                    input
+                    (
+                        set::value($lang->project->longTime),
+                        set::disabled(true)
+                    )
                 )
             )
         ),
diff --git a/module/program/ui/edit.html.php b/module/program/ui/edit.html.php
index b8e214e40d..3ae1b7bd60 100644
--- a/module/program/ui/edit.html.php
+++ b/module/program/ui/edit.html.php
@@ -113,8 +113,18 @@ formPanel
                     set::value($program->end),
                     set::placeholder($lang->project->end),
                     set::required(true),
-                    $program->end == LONG_TIME ? set::disabled(true) : null,
+                    $program->end == LONG_TIME ? setClass('hidden') : null,
                     on::change('computeWorkDays')
+                ),
+                inputControl
+                (
+                    setClass('has-suffix-icon w-full' . ($program->end != LONG_TIME ? ' hidden' : '')),
+                    to::suffix(icon('calendar')),
+                    input
+                    (
+                        set::value($lang->project->longTime),
+                        set::disabled(true)
+                    )
                 )
             )
         ),