diff --git a/app/controllers/enterprise_controller.rb b/app/controllers/enterprise_controller.rb
index 14ebb16..7e8bc0f 100644
--- a/app/controllers/enterprise_controller.rb
+++ b/app/controllers/enterprise_controller.rb
@@ -67,7 +67,10 @@ class EnterpriseController < ApplicationController
     @enterprise.destroy
     redirect_to :action => 'index'
   end
-
+  
+  def search
+    @tagged_enterprises = Enterprise.find_tagged_with(params[:query])
+  end
 
   protected
 
diff --git a/app/views/enterprise/list.rhtml b/app/views/enterprise/list.rhtml
index 45c6a3f..47b5dd1 100644
--- a/app/views/enterprise/list.rhtml
+++ b/app/views/enterprise/list.rhtml
@@ -1,3 +1,10 @@
+<div class="search_box">
+<% form_tag :action => 'search' do %>
+  <%= text_field_tag 'query' %>
+  <%= submit_tag _('Search') %>
+<% end %>
+</div>
+
 <p> <%= link_to _('Register new enterprise'), :action => 'register_form' %> </p>
 <h2> <%= _('Listing my enterprises') %> </h2>
 <ul>
--
libgit2 0.21.2