diff --git a/app/views/layouts/application-ng.rhtml b/app/views/layouts/application-ng.rhtml
index 480e3f9..3bf2d38 100644
--- a/app/views/layouts/application-ng.rhtml
+++ b/app/views/layouts/application-ng.rhtml
@@ -69,7 +69,7 @@
               <% end %>
 
           </span>
-          <form action="/search" class="search_form" method="get" class="clean">
+          <form action="/search" class="search_form clean" method="get" id="top-search">
             <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
             <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
             <%= javascript_tag 'jQuery("#user form input").hint();' %>
diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index 382ee10..5af16d4 100644
--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
@@ -217,6 +217,12 @@ class ApplicationControllerTest < ActionController::TestCase
     assert_no_tag :tag => 'div', :attributes => { :id => 'user_box' }, :descendant => { :tag => 'a', :attributes => { :href => 'http://web.mail/' } }
   end
 
+  should 'display search form with id' do
+    @controller.stubs(:get_layout).returns('application-ng')
+    get :index
+    assert_tag :tag => 'form', :attributes => { :class => 'search_form clean', :id => 'top-search' }
+  end
+
   should 'display theme test panel when testing theme' do
     @request.session[:theme] = 'my-test-theme'
     theme = mock
--
libgit2 0.21.2