diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 72a0f421..b39d5674 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -246,6 +246,10 @@ module TodosHelper
     # @contexts.empty?
     array_or_string_for_javascript( current_user.contexts.collect{|c| escape_javascript(c.name) } )
   end
+
+  def tag_names_for_autocomplete
+    array_or_string_for_javascript( Tag.all.collect{|c| escape_javascript(c.name) } )
+  end
   
   def default_contexts_for_autocomplete
     projects = current_user.projects.find(:all, :conditions => ['default_context_id is not null'])
diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb
index c35c818a..0f15ab66 100644
--- a/app/views/layouts/standard.html.erb
+++ b/app/views/layouts/standard.html.erb
@@ -31,6 +31,7 @@
       var projectNames = <%= project_names_for_autocomplete %>;
       var defaultContexts = <%= default_contexts_for_autocomplete %>;
       var defaultTags = <%= default_tags_for_autocomplete %>;
+      var tagNames = <%= tag_names_for_autocomplete %>;
       <% end -%>
     </script>
     <link rel="shortcut icon" href="<%= url_for(:controller => 'favicon.ico') %>" />
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index d9b91aa4..fb0d7b60 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -265,6 +265,7 @@ function enable_rich_interaction(){
   $('input[name=context_name]').autocomplete(contextNames);
   $('input[name=project[default_context_name]]').autocomplete(contextNames);
   $('input[name=project_name]').autocomplete(projectNames);
+  $('input[name=tag_list]').autocomplete(tagNames, {multiple: true,multipleSeparator:','});
 
   /* have to bind on keypress because of limitataions of live() */
   $('input[name=project_name]').live('keypress', function(){