diff --git a/ChangeLog b/ChangeLog
index ce2004c8b3..d68b0a55eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
 - bug #3527531 [interface] GC-maxlifetime warning incorrectly displayed
 - bug #3526916 [interface] Search fails with JS error when tooltips disabled
 - bug #3544366 [interface] Event comments not saved
+- bug #3549084 [edit] Can't enter date directly when editing inline
 
 3.5.2.0 (2012-07-07)
 - bug #3521416 [interface] JS error when editing index
diff --git a/js/makegrid.js b/js/makegrid.js
index e13ec7eece..a1decc4fd6 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -976,6 +976,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                         $input_field.val('');
                     }
                     $editArea.append('<div class="cell_edit_hint">' + g.cellEditHint + '</div>');
+
+                    // remove {cursor: 'pointer'} added inside timepicker.js
+                    $input_field.css('cursor', '');
+                    // make the cell editable, so one can can bypass the timepicker
+                    // and enter date/time value manually
+                    g.isEditCellTextEditable = true;
                 } else {
                     g.isEditCellTextEditable = true;
                     // only append edit area hint if there is a null checkbox