diff --git a/app/assets/javascripts/tags.js.coffee b/app/assets/javascripts/tags.js.coffee
index 6e3c7165c..e641203f7 100644
--- a/app/assets/javascripts/tags.js.coffee
+++ b/app/assets/javascripts/tags.js.coffee
@@ -8,7 +8,7 @@ App.Tags =
 
       unless $this.data('initialized') is 'yes'
         $this.on('click', ->
-          name = $(this).text()
+          name = '"' + $(this).text() + '"'
           current_tags = $tag_input.val().split(',').filter(Boolean)
 
           if $.inArray(name, current_tags) >= 0
diff --git a/lib/tag_sanitizer.rb b/lib/tag_sanitizer.rb
index 643bca19c..538ab8c1e 100644
--- a/lib/tag_sanitizer.rb
+++ b/lib/tag_sanitizer.rb
@@ -1,10 +1,10 @@
 class TagSanitizer
-  DISALLOWED_STRINGS = %w(? < > = /)
+  DISALLOWED_STRINGS = %w[? < > = /]
 
   def sanitize_tag(tag)
     tag = tag.dup
     DISALLOWED_STRINGS.each do |s|
-      tag.gsub!(s, '')
+      tag.gsub!(s, "")
     end
     tag.truncate(TagSanitizer.tag_max_length)
   end
@@ -14,7 +14,7 @@ class TagSanitizer
   end
 
   def self.tag_max_length
-    40
+    160
   end
 
 end