diff --git a/js/makegrid.js b/js/makegrid.js
index 07ea150fb4..1863aa2026 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1700,7 +1700,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             g.showDataRowLinkText = PMA_messages.strShowDataRowLink;
 
             // initialize cell editing configuration
-            g.saveCellsAtOnce = $('#save_cells_at_once').val();
+            g.saveCellsAtOnce = $(t).find('.save_cells_at_once').val();
             g.maxTruncatedLen = PMA_commonParams.get('LimitChars');
 
             // register events
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index de167da1d5..dc0364b3c1 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1056,7 +1056,7 @@ class PMA_DisplayResults
         }
 
         // Output data needed for grid editing
-        $table_headers_html .= '<input id="save_cells_at_once" type="hidden" value="'
+        $table_headers_html .= '<input class="save_cells_at_once" type="hidden" value="'
             . $GLOBALS['cfg']['SaveCellsAtOnce'] . '" />'
             . '<div class="common_hidden_inputs">'
             . PMA_URL_getHiddenInputs(