diff --git a/tildes/static/js/behaviors/comment-text.js b/tildes/static/js/behaviors/external-links-new-tabs.js
similarity index 65%
rename from tildes/static/js/behaviors/comment-text.js
rename to tildes/static/js/behaviors/external-links-new-tabs.js
index 572002b..ff46571 100644
--- a/tildes/static/js/behaviors/comment-text.js
+++ b/tildes/static/js/behaviors/external-links-new-tabs.js
@@ -1,4 +1,4 @@
-$.onmount('[data-js-comment-text]', function() {
+$.onmount('[data-js-external-links-new-tabs]', function() {
     // Make all links in comment open in new tab
     $(this).find('a[href^="http"]').attr('target', '_blank');
 });
diff --git a/tildes/tildes/templates/macros/comments.jinja2 b/tildes/tildes/templates/macros/comments.jinja2
index a61043d..4d9b147 100644
--- a/tildes/tildes/templates/macros/comments.jinja2
+++ b/tildes/tildes/templates/macros/comments.jinja2
@@ -94,7 +94,11 @@
         </ul>
       {% endif %}
 
-      <div class="comment-text" data-js-comment-text>
+      <div class="comment-text"
+        {% if request.user and request.user.open_new_tab_text %}
+        data-js-external-links-new-tabs
+        {% endif %}
+      >
         {% if comment.is_removed and 'admin' in request.effective_principals %}
           <p class="text-warning">Comment removed</p>
         {% endif %}