diff --git a/js/makegrid.js b/js/makegrid.js
index 3f225139be..ccfdedd3b5 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -320,11 +320,9 @@
                 }
                 // enable or disable restore button
                 if (isInitial) {
-                    $('#restore_table').attr('disabled', 'disabled');
-                    $('#restore_table').fadeTo('fast', 0.5);
+                    $('#restore_column').hide();
                 } else {
-                    $('#restore_table').removeAttr('disabled');
-                    $('#restore_table').fadeTo('fast', 1.0);
+                    $('#restore_column').show();
                 }
             }
         }
@@ -407,7 +405,7 @@
         $(document).mouseup(function(e) {
             g.dragEnd(e);
         });
-        $('#restore_table').live('click', function() {
+        $('#restore_column').live('click', function() {
             g.restore();
         });
         
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 63bdd85416..d2306cbbd7 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -375,7 +375,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di
     } // end move toward
     ?>
     <td>
-        <input id="restore_table" type="submit" value="Restore table" />
+        <input id="restore_column" type="submit" value="Restore column order" />
         <?php
         // generate the column order, if it is set
         $pmatable = new PMA_Table($GLOBALS['table'], $GLOBALS['db']);