diff --git a/js/src/navigation.js b/js/src/navigation.js
index 4562a3fd9c..025a85ef82 100644
--- a/js/src/navigation.js
+++ b/js/src/navigation.js
@@ -411,15 +411,15 @@ $(function () {
     /**
      * Bind all "fast filter" events
      */
-    $(document).on('click', '#pma_navigation_tree li.fast_filter button.searchClauseClear', Navigation.FastFilter.events.clear);
-    $(document).on('focus', '#pma_navigation_tree li.fast_filter input.searchClause', Navigation.FastFilter.events.focus);
-    $(document).on('blur', '#pma_navigation_tree li.fast_filter input.searchClause', Navigation.FastFilter.events.blur);
-    $(document).on('keyup', '#pma_navigation_tree li.fast_filter input.searchClause', Navigation.FastFilter.events.keyup);
+    $('#pma_navigation_tree').on('click', 'li.fast_filter button.searchClauseClear', Navigation.FastFilter.events.clear);
+    $('#pma_navigation_tree').on('focus', 'li.fast_filter input.searchClause', Navigation.FastFilter.events.focus);
+    $('#pma_navigation_tree').on('blur', 'li.fast_filter input.searchClause', Navigation.FastFilter.events.blur);
+    $('#pma_navigation_tree').on('keyup', 'li.fast_filter input.searchClause', Navigation.FastFilter.events.keyup);
 
     /**
      * Ajax handler for pagination
      */
-    $(document).on('click', '#pma_navigation_tree div.pageselector a.ajax', function (event) {
+    $('#pma_navigation_tree').on('click', 'div.pageselector a.ajax', function (event) {
         event.preventDefault();
         Navigation.treePagination($(this));
     });
@@ -427,18 +427,18 @@ $(function () {
     /**
      * Node highlighting
      */
-    $(document).on(
+    $('#pma_navigation_tree.highlight').on(
         'mouseover',
-        '#pma_navigation_tree.highlight li:not(.fast_filter)',
+        'li:not(.fast_filter)',
         function () {
             if ($('li:visible', this).length === 0) {
                 $(this).addClass('activePointer');
             }
         }
     );
-    $(document).on(
+    $('#pma_navigation_tree.highlight').on(
         'mouseout',
-        '#pma_navigation_tree.highlight li:not(.fast_filter)',
+        'li:not(.fast_filter)',
         function () {
             $(this).removeClass('activePointer');
         }