diff --git a/ChangeLog b/ChangeLog
index 5129be04bb..adad55aec5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,7 @@ explanation
 - bug #4746 Right-aligned columns have left-aligned header
 - bug #4779 PMA_Util::parseEnumSetValues fails on enums with UTF-8 values
 - bug       Undefined index savedsearcheswork 
+- bug #4788 Inline edit of DATE fields with NULL, NULL checkbox is under datepicker 
 
 4.3.11.1 (2015-03-04)
 - bug       [security] Risk of BREACH attack, see PMASA-2015-1
diff --git a/js/makegrid.js b/js/makegrid.js
index d74aa6fca4..80c65df6ec 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1033,6 +1033,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
 
                     $input_field.datepicker("show");
 
+                    var datepicker_top = parseInt(document.getElementById("ui-datepicker-div").style.getPropertyValue("top"), 10);
+
+                    if (datepicker_top > 370 && !is_null) {
+                        document.getElementById("ui-datepicker-div").style.marginTop = "30px";
+                    }
+
                     if (is_null){
                         $(g.cEdit).find('.edit_area').hide();
                     }