diff --git a/js/navigation.js b/js/navigation.js
index 391b77d68..280117faf 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -187,6 +187,11 @@ function clear_fast_filter() {
 $(document).ready(function(){
     /* Display filter */
     $('#NavFilter').css('display', 'inline');
+    $('input[id="fast_filter"]').focus(function() {
+        if($(this).attr("value") === "filter tables by name") {
+            clear_fast_filter();
+        }
+    });
     $('#clear_fast_filter').click(clear_fast_filter);
     $('#fast_filter').focus(function (evt) {evt.target.select();});
     $('#fast_filter').keyup(function (evt) {fast_filter(evt.target.value);});
diff --git a/navigation.php b/navigation.php
index 8eb5c8e2b..7d6d66c83 100644
--- a/navigation.php
+++ b/navigation.php
@@ -289,7 +289,7 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
     if ($table_count) {
         ?>
         <span id="NavFilter">
-        <input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter'); ?>" />
+        <input type="text" name="fast_filter" id="fast_filter" title="<?php echo __('Filter'); ?>" value="filter tables by name" />
         <span id="clear_fast_filter" title="<?php echo __('Clear'); ?>">X</span>
         </span>
         <?php