diff --git a/js/makegrid.js b/js/makegrid.js
index 0cf6ed0b76..a2be1049ff 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1575,7 +1575,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             var $firstRowCols = $(g.t).find('tr:first th.draggable');
 
             // initialize column visibility
-            var $col_visib = $('#col_visib');   // check if column visibility is passed from PHP
+            var $col_visib = $(t).find('.col_visib');   // check if column visibility is passed from PHP
             if ($col_visib.length > 0) {
                 g.colVisib = $col_visib.val().split(',');
                 for (var i = 0; i < g.colVisib.length; i++) {
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index cca34b9d7f..f755caf701 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1576,7 +1576,7 @@ class PMA_DisplayResults
         $col_visib = $pmatable->getUiProp(PMA_Table::PROP_COLUMN_VISIB);
 
         if ($col_visib) {
-            $data_html .= '<input id="col_visib" type="hidden" value="'
+            $data_html .= '<input class="col_visib" type="hidden" value="'
                 . implode(',', $col_visib) . '" />';
         }