diff --git a/app/controllers/manage_tags_controller.rb b/app/controllers/manage_tags_controller.rb
index 67e2bb5..5541b35 100644
--- a/app/controllers/manage_tags_controller.rb
+++ b/app/controllers/manage_tags_controller.rb
@@ -67,4 +67,9 @@ class ManageTagsController < ApplicationController
       redirect_to :action => 'list'
     end
   end
+
+  # Full-text search for tags that have the query terms
+  def search
+    @tags_found = Tag.find_by_contents(params[:query][:term])
+  end
 end
diff --git a/app/views/manage_tags/_form.rhtml b/app/views/manage_tags/_form.rhtml
index 4a103ac..fc8b309 100644
--- a/app/views/manage_tags/_form.rhtml
+++ b/app/views/manage_tags/_form.rhtml
@@ -1,3 +1,3 @@
-Name: <%= text_field 'tag', 'name' %> <br>
-Parent tag: <%= select('tag', 'parent_id', @parent_tags.collect {|p| [ p.name, p.id ] }, { :include_blank => true }) %> <br>
-Pending: <%= check_box 'tag', 'pending' %> <br>
+<%= _('Name') %>: <%= text_field 'tag', 'name' %> <br>
+<%= _('Parent tag') %>: <%= select('tag', 'parent_id', @parent_tags.collect {|p| [ p.name, p.id ] }, { :include_blank => true }) %> <br>
+<%= _('Pending') %>: <%= check_box 'tag', 'pending' %> <br>
diff --git a/app/views/manage_tags/list.rhtml b/app/views/manage_tags/list.rhtml
index ec4244d..3abad85 100644
--- a/app/views/manage_tags/list.rhtml
+++ b/app/views/manage_tags/list.rhtml
@@ -1,3 +1,9 @@
+<br/>
+<% form_tag :action => 'search' do %>
+  <%= text_field 'query', 'term'%>
+  <%= submit_tag _('Search') %>
+<% end %>
+
 <h2> <%= _("Listing tags") %> </h2>
 
 <ul>
diff --git a/app/views/manage_tags/search.rhtml b/app/views/manage_tags/search.rhtml
new file mode 100644
index 0000000..a9a05da
--- /dev/null
+++ b/app/views/manage_tags/search.rhtml
@@ -0,0 +1,10 @@
+<h2> <%= _('Matching tags') %></h2>
+
+<% if not @tags_found.empty? %>
+  <%= @tags_found.size.to_s + (@tags_found.size > 1 ? ' tags' : ' tag') + _(' was found') %> 
+  <%= render :partial => 'a_tag', :collection => @tags_found %>
+<% else %>
+  <%= _('No tags found matching criteria') %>
+<% end %>
+
+<%= link_to _('Back'), :action => 'list' %>
diff --git a/lib/extended_tag.rb b/lib/extended_tag.rb
index 0ace057..8078135 100644
--- a/lib/extended_tag.rb
+++ b/lib/extended_tag.rb
@@ -1,9 +1,11 @@
 class Tag
+  
   @@original_find = self.method(:find) 
   # Rename the find method to find_with_pendings that includes all tags in the search regardless if its pending or not 
   def self.find_with_pendings(*args)
       @@original_find.call(*args)
   end
+  
   # Redefine the find method to exclude the pending tags from the search not allowing to tag something with an unapproved tag
   def self.find(*args)
     self.with_scope(:find => { :conditions => ['pending = ?', false] }) do
@@ -11,6 +13,9 @@ class Tag
     end
   end
 
+  acts_as_ferret :fields => [:name]
+
+
   # Return all the tags that were suggested but not yet approved
   def self.find_pendings
     self.find_with_pendings(:all, :conditions => ['pending = ?', true])
--
libgit2 0.21.2