diff --git a/lib/static/main.js b/lib/static/main.js
index 6a94e9088..801115c5f 100644
--- a/lib/static/main.js
+++ b/lib/static/main.js
@@ -407,7 +407,7 @@ $(function() {
     var $pkgListing    = $('#all-packages')
     var $searchBtn     = $('.js-search-btn')
     var request
-    var currentResults
+    var lastQuery      = ''
 
     var toggle = function(validQuery) {
       $searchResults.toggleClass('show', validQuery)
@@ -418,21 +418,20 @@ $(function() {
     }
 
     $form.bind('submit keyup', function(e) {
-      var q, qBool
+      var query, isValidQuery
 
       e.preventDefault()
 
-      q     = $input.val()
-      qBool = (q !== '')
+      query = $input.val()
+      isValidQuery = (query !== '')
 
-      toggle(qBool)
+      toggle(isValidQuery)
 
-      if (!qBool) {
+      if (!isValidQuery) {
         if (request && typeof request.abort === 'function') {
           request.abort()
         }
 
-        currentResults = null
         $searchResults.html('')
         return
       }
@@ -441,14 +440,13 @@ $(function() {
         request.abort()
       }
 
-      if (!currentResults) {
+      if (query !== lastQuery) {
+        lastQuery = query
         $searchResults.html(
           "<img class='search-ajax' src='-/static/ajax.gif' alt='Spinner'/>")
       }
 
-      request = $.getJSON('-/search/' + q, function( results ) {
-        currentResults = results
-
+      request = $.getJSON('-/search/' + query, function( results ) {
         if (results.length > 0) {
           var html = ''