diff --git a/module/bug/ui/edit.html.php b/module/bug/ui/edit.html.php
index c5f87d30a1..7e7a5a1a50 100644
--- a/module/bug/ui/edit.html.php
+++ b/module/bug/ui/edit.html.php
@@ -538,7 +538,7 @@ detailBody
             item
             (
                 set::name($lang->bug->closedDate),
-                datePicker
+                datetimePicker
                 (
                     set::name('closedDate'),
                     set::value($bug->closedDate)
diff --git a/module/bug/zen.php b/module/bug/zen.php
index b4f5fac4d8..0177156d35 100644
--- a/module/bug/zen.php
+++ b/module/bug/zen.php
@@ -680,6 +680,7 @@ class bugZen extends bug
             ->setIF($formData->data->resolvedBy  != '' && $formData->data->resolvedDate == '', 'resolvedDate', $now)
             ->setIF($formData->data->resolution  != '' && $formData->data->resolvedDate == '', 'resolvedDate', $now)
             ->setIF($formData->data->resolution  != '' && $formData->data->resolvedBy   == '', 'resolvedBy',   $this->app->user->account)
+            ->setIF($formData->data->closedDate  != '' && $formData->data->closedBy     != '', 'closedDate',   formatTime($formData->data->closedDate, 'Y-m-d H:i:s'))
             ->setIF($formData->data->closedDate  != '' && $formData->data->closedBy     == '', 'closedBy',     $this->app->user->account)
             ->setIF($formData->data->closedBy    != '' && $formData->data->closedDate   == '', 'closedDate',   $now)
             ->setIF($formData->data->closedBy    != '' || $formData->data->closedDate   != '', 'assignedTo',   'closed')