diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
index f109f0547..034828529 100644
--- a/r2/r2/models/link.py
+++ b/r2/r2/models/link.py
@@ -334,11 +334,15 @@ class Link(Thing, Printable):
                 get_domain(cname = c.cname, subreddit=False),
                 item._id36)
 
-            item.click_url = item.url
             if item.is_self:
-                item.click_url = item.permalink
-            elif c.user.pref_frame:
-                item.click_url = item.tblink
+                item.href_url = item.permalink
+            else:
+                item.href_url = item.url
+
+            if c.user.pref_frame:
+                item.mousedown_url = item.tblink
+            else:
+                item.mousedown_url = None
 
             item.fresh = not any((item.likes != None,
                                   item.saved,
diff --git a/r2/r2/templates/link.html b/r2/r2/templates/link.html
index cd7ca1373..8d552f569 100644
--- a/r2/r2/templates/link.html
+++ b/r2/r2/templates/link.html
@@ -44,7 +44,7 @@
 
 <%def name="make_link(name, css_class)">
   <a class="${css_class} ${ c.user_is_loggedin and 'loggedin' or ''} ${thing.clicked and 'click' or ''}"
-     href="${thing.click_url}"
+     href="${thing.href_url}"
      %if thing.nofollow:
        rel="nofollow"
      %endif
@@ -53,6 +53,9 @@
      %elif c.cname:
        target="_top"
      %endif
+     %if thing.mousedown_url:
+       onmousedown="this.href='${thing.mousedown_url}'"
+     %endif
      >
      ${caller.body()}
   </a>
diff --git a/r2/r2/templates/link.htmllite b/r2/r2/templates/link.htmllite
index ed0d636d8..42bf39904 100644
--- a/r2/r2/templates/link.htmllite
+++ b/r2/r2/templates/link.htmllite
@@ -55,8 +55,17 @@
          ${optionalstyle("margin-left: 28px; min-height:32px;")}
        %endif
        >
-    <a href="${thing.click_url}" class="reddit-link-title"
-      ${optionalstyle("text-decoration:none;color:#336699;font-size:small;")}>
+    <a href="${thing.href_url}" class="reddit-link-title"
+      ${optionalstyle("text-decoration:none;color:#336699;font-size:small;")}
+       %if c.user.pref_newwindow:
+         target="_blank"
+       %elif c.cname:
+         target="_top"
+       %endif
+       %if thing.mousedown_url:
+         onmousedown="this.href='${thing.mousedown_url}'"
+       %endif
+       >
       ${thing.title}
     </a>
     %if not expanded: