diff --git a/ChangeLog b/ChangeLog
index 559dd8ff31..ffe446da45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,6 +61,7 @@ VerboseMultiSubmit, ReplaceHelpImg
 - bug #3540922 [edit] Error searching table with many fields
 - bug #3555104 [edit] Cannot copy a DB with table & views
 - bug #3559925 [privileges] Incorrect updating of the list of users
+- bug #3561224 [edit] cell edit date field with empty date fills in current date
 
 3.5.2.2 (2012-08-12)
 - [security] Fixed XSS vulnerabilities, see PMASA-2012-4
diff --git a/js/makegrid.js b/js/makegrid.js
index 1d2f46139d..8dd1f535e2 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -984,10 +984,13 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
 
                     // force to restore modified $input_field value after adding datepicker
                     // (after adding a datepicker, the input field doesn't display the time anymore, only the date)
-                    if (!is_null) {
-                        $editArea.datetimepicker('setDate', current_datetime_value);
+                    if (is_null 
+                        || current_datetime_value == '0000-00-00' 
+                        || current_datetime_value == '0000-00-00 00:00:00'
+                    ) {
+                        $input_field.val(current_datetime_value);
                     } else {
-                        $input_field.val('');
+                        $editArea.datetimepicker('setDate', current_datetime_value);                        
                     }
                     $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');