diff --git a/aleksis/core/static/js/main.js b/aleksis/core/static/js/main.js
index 403837da22d351d8e97ed3cf6c27c79e30514497..b625c105f4e0e8a51b581104049bd1d76bcbc200 100644
--- a/aleksis/core/static/js/main.js
+++ b/aleksis/core/static/js/main.js
@@ -66,7 +66,7 @@ $(document).ready( function () {
     });
 
     // Initialise auto-completion for search bar
-    window.autocomplete = new Autocomplete({});
+    window.autocomplete = new Autocomplete({minimum_length: 2});
     window.autocomplete.setup();
 
     // Initialize text collapsibles [MAT, own work]
diff --git a/aleksis/core/static/js/search.js b/aleksis/core/static/js/search.js
index 7943d2ebfaa07123bf0174b24c055884ceb0bd36..ea1dfb25b061f73a8a74c40edad3e3c8d073278e 100644
--- a/aleksis/core/static/js/search.js
+++ b/aleksis/core/static/js/search.js
@@ -35,9 +35,20 @@ Autocomplete.prototype.setup = function () {
         self.query_box.trigger("keydown");
     });
 
+    this.query_box.keyup(function () {
+        var query = self.query_box.val();
+
+        if (query.length < self.minimum_length) {
+            $("#search-results").remove();
+            return true;
+        }
+
+        self.fetch(query);
+        return true;
+    });
+
     // Watch the input box.
     this.query_box.keydown(function (e) {
-        var query = self.query_box.val();
 
         if (e.which === 38) { // Keypress Up
             if (!self.selected_element) {
@@ -69,14 +80,6 @@ Autocomplete.prototype.setup = function () {
             e.preventDefault();
             window.location.href = self.selected_element.attr("href");
         }
-
-        if (query.length < self.minimum_length) {
-            $("#search-results").remove();
-            return true;
-        }
-
-        self.fetch(query);
-        return true;
     });
 
     // // On selecting a result, remove result box