diff --git a/db_sql.php b/db_sql.php
index 67bbbb59d6..987dbaff5f 100644
--- a/db_sql.php
+++ b/db_sql.php
@@ -19,6 +19,7 @@ $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('functions.js');
 $scripts->addFile('makegrid.js');
+$scripts->addFile('jquery/jquery.uitablefilter.js');
 $scripts->addFile('sql.js');
 
 require 'libraries/db_common.inc.php';
diff --git a/js/sql.js b/js/sql.js
index 99c1988563..b29982a323 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -392,7 +392,8 @@ AJAX.registerOnload('sql.js', function () {
 
     // Filter row handling. --STARTS--
     $(".filter_rows").live("keyup", function () {
-        var $target_table = $("#table_results");
+        var unique_id = $(this).data("for");
+        var $target_table = $("#table_results[data-uniqueId='" + unique_id + "']");
         var $header_cells = $target_table.find("th[data-column]");
         var target_columns = Array();
         // To handle colspan=4, in case of edit,copy etc options.
@@ -406,7 +407,7 @@ AJAX.registerOnload('sql.js', function () {
 
         var phrase = $(this).val();
         // Set same value to both Filter rows fields.
-        $(".filter_rows").val(phrase);
+        $(".filter_rows[data-for='" + unique_id + "']").val(phrase);
         // Handle colspan.
         $target_table.find("thead > tr").prepend(dummy_th);
         $.uiTableFilter($target_table, phrase, target_columns);
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 86073725c5..4c76f26e20 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -800,8 +800,9 @@ class PMA_DisplayResults
             . '<td class="navigation_separator"></td>'
             . '<td>'
             . '<span>' . __('Filter rows') . ':</span>'
-            . '<input type="text" class="filter_rows" placeholder="'
-            . __('Search this table') . '">'
+            . '<input type="text" class="filter_rows"'
+            . ' placeholder="' . __('Search this table') . '"'
+            . ' data-for="' . $this->__get('unique_id') . '" />'
             . '</td>'
             . '<td class="navigation_separator"></td>'
             . '</tr>'
@@ -1789,9 +1790,10 @@ class PMA_DisplayResults
                 . '<input type="hidden" name="goto" value="sql.php" />';
         }
 
-        $form_html .= '<table id="table_results" class="table_results data';
-        $form_html .= ' ajax';
-        $form_html .= '">';
+        $form_html .= '<table id="table_results"';
+        $form_html .= ' class="table_results data ajax"';
+        $form_html .= ' data-uniqueId="' . $this->__get('unique_id') . '"';
+        $form_html .= '>';
 
         return $form_html;
 
diff --git a/server_sql.php b/server_sql.php
index 1d505e4305..953e17587d 100644
--- a/server_sql.php
+++ b/server_sql.php
@@ -18,6 +18,7 @@ $response = PMA_Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('makegrid.js');
+$scripts->addFile('jquery/jquery.uitablefilter.js');
 $scripts->addFile('sql.js');
 
 require_once 'libraries/server_common.inc.php';
diff --git a/tbl_sql.php b/tbl_sql.php
index 0035840199..92c980d4d8 100644
--- a/tbl_sql.php
+++ b/tbl_sql.php
@@ -18,6 +18,7 @@ $response = PMA_Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('makegrid.js');
+$scripts->addFile('jquery/jquery.uitablefilter.js');
 $scripts->addFile('sql.js');
 
 require 'libraries/tbl_common.inc.php';