diff --git a/tildes/alembic/versions/de83b8750123_add_setting_to_open_text_links_in_new_.py b/tildes/alembic/versions/de83b8750123_add_setting_to_open_text_links_in_new_.py
new file mode 100644
index 0000000..e8705db
--- /dev/null
+++ b/tildes/alembic/versions/de83b8750123_add_setting_to_open_text_links_in_new_.py
@@ -0,0 +1,24 @@
+"""Add setting to open text links in new tab
+
+Revision ID: de83b8750123
+Revises: 2512581c91b3
+Create Date: 2018-07-24 03:10:59.485645
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'de83b8750123'
+down_revision = '2512581c91b3'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column('users', sa.Column('open_new_tab_text', sa.Boolean(), server_default='false', nullable=False))
+
+
+def downgrade():
+    op.drop_column('users', 'open_new_tab_text')
diff --git a/tildes/tildes/models/user/user.py b/tildes/tildes/models/user/user.py
index d4f9f40..af69bf7 100644
--- a/tildes/tildes/models/user/user.py
+++ b/tildes/tildes/models/user/user.py
@@ -86,6 +86,8 @@ class User(DatabaseModel):
         Boolean, nullable=False, server_default='false')
     open_new_tab_internal: bool = Column(
         Boolean, nullable=False, server_default='false')
+    open_new_tab_text: bool = Column(
+        Boolean, nullable=False, server_default='false')
     is_banned: bool = Column(Boolean, nullable=False, server_default='false')
     is_admin: bool = Column(Boolean, nullable=False, server_default='false')
     home_default_order: Optional[TopicSortOption] = Column(
diff --git a/tildes/tildes/templates/settings.jinja2 b/tildes/tildes/templates/settings.jinja2
index e8264f6..1000614 100644
--- a/tildes/tildes/templates/settings.jinja2
+++ b/tildes/tildes/templates/settings.jinja2
@@ -73,6 +73,20 @@
               </label>
             </div>
           </li>
+          <li>
+            <div class="form-group">
+              <label class="form-checkbox">
+                <input
+                  type="checkbox"
+                  id="open_new_tab_text"
+                  name="open_new_tab_text"
+                  data-js-autosubmit-on-change
+                  {% if request.user.open_new_tab_text %}checked{% endif %}
+                >
+                <i class="form-icon"></i> Links in topic and comment text
+              </label>
+            </div>
+          </li>
         </ul>
       </form>
     </li>
diff --git a/tildes/tildes/views/api/web/user.py b/tildes/tildes/views/api/web/user.py
index 49d0f87..30c2326 100644
--- a/tildes/tildes/views/api/web/user.py
+++ b/tildes/tildes/views/api/web/user.py
@@ -116,8 +116,10 @@ def change_open_links_new_tab(request: Request) -> Response:
 
     external = bool(request.params.get('open_new_tab_external'))
     internal = bool(request.params.get('open_new_tab_internal'))
+    text = bool(request.params.get('open_new_tab_text'))
     user.open_new_tab_external = external
     user.open_new_tab_internal = internal
+    user.open_new_tab_text = text
 
     return IC_NOOP