diff --git a/js/src/sql.js b/js/src/sql.js
index a9c5aad69c..afa9505b04 100644
--- a/js/src/sql.js
+++ b/js/src/sql.js
@@ -214,7 +214,7 @@ AJAX.registerTeardown('sql.js', function () {
     $('body').off('click', '#simulate_dml');
     $('body').off('keyup', '#sqlqueryform');
     $('body').off('click', 'form[name="resultsForm"].ajax button[name="submit_mult"], form[name="resultsForm"].ajax input[name="submit_mult"]');
-    $(document).off('submit', '#maxRowsForm');
+    $(document).off('submit', '.maxRowsForm');
     $(document).off('click', '#view_as');
 });
 
@@ -840,7 +840,7 @@ AJAX.registerOnload('sql.js', function () {
         $.post(url, submitData, AJAX.responseHandler);
     });
 
-    $(document).on('submit', '#maxRowsForm', function () {
+    $(document).on('submit', '.maxRowsForm', function () {
         var unlimNumRows = $(this).find('input[name="unlim_num_rows"]').val();
 
         var maxRowsCheck = Functions.checkFormElementInRange(
diff --git a/templates/display/results/table.twig b/templates/display/results/table.twig
index 85ba62dd57..15be174c76 100644
--- a/templates/display/results/table.twig
+++ b/templates/display/results/table.twig
@@ -40,7 +40,7 @@
           </div>
         </td>
         <td class="navigation_goto">
-          <form action="{{ url('/sql') }}" method="post" id="maxRowsForm">
+          <form action="{{ url('/sql') }}" method="post" class="maxRowsForm">
             {{ get_hidden_fields(navigation.hidden_fields|merge({
               'pos': navigation.pos,
               'unlim_num_rows': unlim_num_rows