diff --git a/module/project/ui/common.field.php b/module/project/ui/common.field.php
index 563ba5d1ce..a3e170e93c 100644
--- a/module/project/ui/common.field.php
+++ b/module/project/ui/common.field.php
@@ -57,7 +57,7 @@ $fields->field('begin')
     ->endPlaceholder($lang->project->end)
     ->endValue(data('project.end') == LONG_TIME ? '' : data('project.end'))
     ->endDisabled($isLongTime)
-    ->endMenu($lang->project->endList)
+    ->endList($lang->project->endList)
     ->controlEnd()
     ->tip(' ')
     ->tipProps(array('id' => 'dateTip'))
diff --git a/module/project/ui/create.html.php b/module/project/ui/create.html.php
index 226a4db605..d95fc572a6 100644
--- a/module/project/ui/create.html.php
+++ b/module/project/ui/create.html.php
@@ -49,7 +49,7 @@ $modeDropdown = dropdown
 );
 
 $handleLongTimeChange = jsCallback()->do(<<<'JS'
-    const endPicker = $element.find('[name=end]').zui('datePicker');
+    const endPicker = $element.find('[name=end]').closest('[data-zui-datepicker]').zui('datePicker');
     const longTime = $element.find('[name=longTime]').prop('checked');
     endPicker.render({disabled: longTime});
     if(longTime) endPicker.$.setValue('');