diff --git a/ChangeLog b/ChangeLog
index 9aecb1712..213f95456 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -114,6 +114,7 @@ $Id$
 - [core] Remove last remaining parts of profiling code which was removed in 2006.
 - bug #3042665 [parser] Add workaround for MySQL way of handling backtick.
 - bug #3056610 [interface] Removed modification options for information_schema 
++ patch #3055886 [config] Add Left frame table filter visibility config option, thanks to eesau
 
 3.3.7.0 (not yet released)
 - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after
diff --git a/Documentation.html b/Documentation.html
index 5a31aedfe..ec8412ff9 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1489,6 +1489,11 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     or in a new one (<tt>new</tt>). Note: use <tt>new</tt> if you are
     linking to <tt>phpmyadmin.net</tt>.</dd>
 
+    <dt id="cfg_LeftDisplayTableFilter">$cfg['LeftDisplayTableFilter'] boolean</dt>
+    <dd>Defines whether or not to display a JavaScript filter box above the
+    list of tables in the left frame.
+    Defaults to <tt>TRUE</tt>.</dd>
+
     <dt id="cfg_LeftDisplayServers">$cfg['LeftDisplayServers'] boolean</dt>
     <dd>Defines whether or not to display a server choice at the top of the left frame.
         Defaults to FALSE.</dd>
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 466dc2c0d..92869ac5d 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -773,6 +773,13 @@ $cfg['LeftLogoLink'] = 'main.php';
  */
 $cfg['LeftLogoLinkWindow'] = 'main';
 
+/**
+ * display a JavaScript table filter in the left frame
+ *
+ * @global boolean $cfg['LeftDisplayTableFilter']
+ */
+$cfg['LeftDisplayTableFilter'] = true;
+
 /**
  * display server choice at top of left frame
  *
diff --git a/navigation.php b/navigation.php
index 7d6d66c83..bebdb19d0 100644
--- a/navigation.php
+++ b/navigation.php
@@ -286,7 +286,7 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
         $db_tooltip     = $GLOBALS['db'];
     }
 
-    if ($table_count) {
+    if ($table_count && $GLOBALS['cfg']['LeftDisplayTableFilter']) {
         ?>
         <span id="NavFilter">
         <input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter'); ?>" value="filter tables by name" />