diff --git a/tildes/static/js/behaviors/comment-label-button.js b/tildes/static/js/behaviors/comment-label-button.js
index 771fb40..e9f4a9f 100644
--- a/tildes/static/js/behaviors/comment-label-button.js
+++ b/tildes/static/js/behaviors/comment-label-button.js
@@ -24,7 +24,7 @@ $.onmount('[data-js-comment-label-button]', function() {
 
         for (i = 0; i < options.length; i++) {
             var label = options[i];
-            var labelName = label.textContent;
+            var labelName = label.getAttribute("data-js-label-name");
 
             var labelOptionActive = false;
             if (userLabels.indexOf(labelName) !== -1) {
@@ -44,7 +44,8 @@ $.onmount('[data-js-comment-label-button]', function() {
                 }
 
                 $(label).on('after.success.ic', function(evt) {
-                    Tildes.removeUserLabel(commentID, evt.target.textContent);
+                    var labelName = evt.target.getAttribute("data-js-label-name");
+                    Tildes.removeUserLabel(commentID, labelName);
                 });
             } else {
                 label.setAttribute('data-ic-put-to', labelURL + labelName);
@@ -55,7 +56,7 @@ $.onmount('[data-js-comment-label-button]', function() {
                 }
 
                 $(label).on('after.success.ic', function(evt) {
-                    var labelName = evt.target.textContent;
+                    var labelName = evt.target.getAttribute("data-js-label-name");
                     Tildes.addUserLabel(commentID, labelName);
 
                     // if the applied label was Exemplary, remove the button from the
diff --git a/tildes/tildes/templates/macros/comments.jinja2 b/tildes/tildes/templates/macros/comments.jinja2
index 86798cd..531ae7a 100644
--- a/tildes/tildes/templates/macros/comments.jinja2
+++ b/tildes/tildes/templates/macros/comments.jinja2
@@ -257,12 +257,11 @@
       {% for label in options if request.user.is_label_available(label) %}
         <li>
           <a class="btn-comment-label btn-comment-label-{{ label.name|lower }}"
+            data-js-label-name="{{ label.name|lower }}"
             {% if label.reason_prompt %}
               data-js-reason-prompt="{{ label.reason_prompt }}"
             {% endif %}
-          >
-            {{ label.name|lower }}{% if label.reason_prompt %}...{% endif %}
-          </a>
+          >{{ label.name|lower }}{% if label.reason_prompt %}...{% endif %}</a>
         </li>
       {% endfor %}
     </ul>