diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee
index e873a3d2570..e38fba7dc8c 100644
--- a/app/assets/javascripts/search_autocomplete.js.coffee
+++ b/app/assets/javascripts/search_autocomplete.js.coffee
@@ -79,6 +79,11 @@ class @SearchAutocomplete
         project_ref: @projectRef
         term: term
       }, (response) ->
+        # Hide dropdown menu if no suggestions returns
+        if !response.length
+          _this.disableAutocomplete()
+          return
+
         data = []
 
         # List results
@@ -228,10 +233,6 @@ class @SearchAutocomplete
 
     @dropdown.removeClass 'open'
 
-    # Only add class if there's a badge
-    # if @badgePresent()
-      # @searchInput.addClass 'disabled'
-
   badgePresent: ->
     @locationBadgeEl.children().length