diff --git a/js/makegrid.js b/js/makegrid.js
index 6ec43bf73f..2bbfc6e9c1 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1029,10 +1029,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                     //move ui-datepicker-div inside cEdit div
                     var datepicker_div = $('#ui-datepicker-div');
                     datepicker_div.css({'top': 0, 'left': 0, 'position': 'relative'});
-                    $('.cEdit').append(datepicker_div);
+                    $(g.cEdit).append(datepicker_div);
 
                     var edit_area_top = $('#ui-datepicker-div').height()+32;
-                    $('.edit_area').css({'top' : edit_area_top+'px', 'position': 'absolute'});
+                    $(g.cEdit).find('.edit_area').css({'top' : edit_area_top+'px', 'position': 'absolute'});
 
                     if (is_null){
                         $(g.cEdit).find('.edit_area').hide();