diff --git a/js/navigation.js b/js/navigation.js
index 33f335c42..22afbb6cf 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -188,4 +188,6 @@ jQuery(document).ready(function(){
     /* Display filter */
     jQuery('#NavFilter').css('display', 'inline');
     jQuery('#clear_fast_filter').click(clear_fast_filter);
+    jQuery('#fast_filter').focus(function (evt) {evt.target.select();});
+    jQuery('#fast_filter').keyup(function (evt) {fast_filter(evt.target.value);});
 });
diff --git a/navigation.php b/navigation.php
index f3665cff4..5f544e733 100644
--- a/navigation.php
+++ b/navigation.php
@@ -317,10 +317,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 $strNavTableFilter; ?>"
-            onkeyup="setTimeout(function(word){ return function(){ fast_filter(word);}}(this.value),1000);"
-            onfocus="this.select();" />
+        <input type="text" name="fast_filter" id="fast_filter" title="<?php echo $strNavTableFilter; ?>" />
         <span id="clear_fast_filter" title="<?php echo $strReset; ?>">X</span>
         </span>
         <?php