2 files changed, 23 insertions, 9 deletions
diff --git a/searx/static/plugins/js/infinite_scroll.js b/searx/static/plugins/js/infinite_scroll.js
index 9cd582d7f..db84a6908 100644
--- a/searx/static/plugins/js/infinite_scroll.js
+++ b/searx/static/plugins/js/infinite_scroll.js
@@ -1,16 +1,22 @@
 $(document).ready(function() {
     var win = $(window);
     win.scroll(function() {
-        if ($(document).height() - win.height() == win.scrollTop()) {
+        if ($(document).height() - win.height() - win.scrollTop() < 150) {
             var formData = $('#pagination form:last').serialize();
             if (formData) {
                 $('#pagination').html('<div class="loading-spinner"></div>');
-                $.post('./', formData, function (data) {
-                    var body = $(data);
-                    $('#pagination').remove();
-                    $('#main_results').append('<hr/>');
-                    $('#main_results').append(body.find('.result'));
-                    $('#main_results').append(body.find('#pagination'));
+                $.ajax({
+                    type: "POST",
+                    url: './',
+                    data: formData,
+                    dataType: 'html',
+                    success: function(data) {
+                        var body = $(data);
+                        $('#pagination').remove();
+                        $('#main_results').append('<hr/>');
+                        $('#main_results').append(body.find('.result'));
+                        $('#main_results').append(body.find('#pagination'));
+                    }
                 });
             }
         }
diff --git a/searx/static/plugins/js/vim_hotkeys.js b/searx/static/plugins/js/vim_hotkeys.js
index 13bd070e0..b0f265cb5 100644
--- a/searx/static/plugins/js/vim_hotkeys.js
+++ b/searx/static/plugins/js/vim_hotkeys.js
@@ -125,6 +125,14 @@ $(document).ready(function() {
         }
     });
 
+    function nextResult(current, direction) {
+        var next = current[direction]();
+        while (!next.is('.result') && next.length !== 0) {
+            next = next[direction]();
+        }
+        return next
+    }
+
     function highlightResult(which) {
         return function() {
             var current = $('.result[data-vim-selected]');
@@ -157,13 +165,13 @@ $(document).ready(function() {
                         }
                         break;
                     case 'down':
-                        next = current.next('.result');
+                        next = nextResult(current, 'next');
                         if (next.length === 0) {
                             next = $('.result:first');
                         }
                         break;
                     case 'up':
-                        next = current.prev('.result');
+                        next = nextResult(current, 'prev');
                         if (next.length === 0) {
                             next = $('.result:last');
                         }