diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index d00f1e34..c471303b 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -127,7 +127,7 @@ module TodosHelper
   end
 
   def tag_list_text(todo=@todo)
-    todo.tags.collect{|t| t.name}.join(', ')
+    todo.tags.join(', ')
   end
 
   def tag_span (tag, mobile=false)
diff --git a/app/models/tag.rb b/app/models/tag.rb
index f859874c..f4a13f27 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -30,4 +30,8 @@ class Tag < ActiveRecord::Base
     @label ||= name.gsub(' ', '-')
   end
 
+  def to_s
+    name
+  end
+
 end
diff --git a/test/unit/tag_test.rb b/test/unit/tag_test.rb
index fee7332c..e20b5f64 100644
--- a/test/unit/tag_test.rb
+++ b/test/unit/tag_test.rb
@@ -45,5 +45,10 @@ class TagTest < ActiveSupport::TestCase
   def test_tag_label
     assert_equal 'one-two-three', Tag.new(:name => 'one two three').label
   end
-  
+
+  def test_tag_as_string
+    tags = [Tag.new(:name => 'tag1'), Tag.new(:name => 'tag2')]
+    assert_equal 'tag1, tag2', tags.join(', ')
+  end
+
 end