diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index d11ca06..cb90874 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1419,7 +1419,7 @@ module ApplicationHelper
   end
 
   def search_input_with_suggestions(name, asset, default, options = {})
-    text_field_tag name, default, options.merge({:id => 'search-input', 'data-asset' => asset})
+    text_field_tag name, default, options.merge({:class => 'search-input-with-suggestions', 'data-asset' => asset})
   end
 
   def profile_suggestion_profile_connections(suggestion)
diff --git a/app/views/search/_search_form.html.erb b/app/views/search/_search_form.html.erb
index 96ce4f7..a98abb0 100644
--- a/app/views/search/_search_form.html.erb
+++ b/app/views/search/_search_form.html.erb
@@ -9,7 +9,7 @@
 
     <div class="search-field">
       <span class="formfield">
-        <%= search_input_with_suggestions('query', @asset, @query, {:size => 50, :placeholder => hint}) %>
+        <%= search_input_with_suggestions('query', @asset, @query, {:id => 'search-input', :size => 50, :placeholder => hint}) %>
       </span>
 
       <%= submit_button(:search, _('Search')) %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index ddf1401..7fb0ac0 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1090,7 +1090,7 @@ jQuery(document).ready(function(){
   // Suggestions on search inputs
   (function($) {
     var suggestions_cache = {};
-    $("#search-input").autocomplete({
+    $(".search-input-with-suggestions").autocomplete({
       minLength: 2,
       select: function(event, ui){
         $(this).val(ui.item.value);
@@ -1102,7 +1102,7 @@ jQuery(document).ready(function(){
           response(suggestions_cache[term]);
           return;
         }
-        request["asset"] = $("#search-input").data("asset");
+        request["asset"] = this.element.data("asset");
         $.getJSON("/search/suggestions", request, function(data, status, xhr) {
           suggestions_cache[term] = data;
           response(data);
diff --git a/public/javascripts/search.js b/public/javascripts/search.js
index fcc7a5f..ff691b7 100644
--- a/public/javascripts/search.js
+++ b/public/javascripts/search.js
@@ -37,12 +37,12 @@
   });
 
   // Real time search
-  // $("input#search-input").typeWatch({
+  // $(".search-input-with-suggestions").typeWatch({
   //   callback: function (value) {$('form.search_form').submit()},
   //   wait: 750,
   //   highlight: true,
   //   captureLength: 2
   // });
 
-  $("input#search-input").bind('notext', function(){ $('form.search_form').submit() });
+  $(".search-input-with-suggestions").bind('notext', function(){ $('form.search_form').submit() });
 })(jQuery);
--
libgit2 0.21.2