diff --git a/src/components/name-text.jsx b/src/components/name-text.jsx
index 285bf886..1b8ab775 100644
--- a/src/components/name-text.jsx
+++ b/src/components/name-text.jsx
@@ -15,7 +15,7 @@ export default ({ account, showAvatar, showAcct, short, external }) => {
     <a
       class={`name-text ${short ? 'short' : ''}`}
       href={url}
-      target="_blank"
+      // target="_blank"
       title={`@${acct}`}
       onClick={(e) => {
         if (external) return;
diff --git a/src/components/status.jsx b/src/components/status.jsx
index f047324f..9eeb7041 100644
--- a/src/components/status.jsx
+++ b/src/components/status.jsx
@@ -506,7 +506,7 @@ function Status({ statusID, status, withinContext, size = 'm', skeleton }) {
       {size !== 's' && (
         <a
           href={url}
-          target="_blank"
+          // target="_blank"
           title={`@${acct}`}
           onClick={(e) => {
             e.preventDefault();
@@ -604,6 +604,14 @@ function Status({ statusID, status, withinContext, size = 'm', skeleton }) {
             dangerouslySetInnerHTML={{
               __html: enhanceContent(content, {
                 emojis,
+                postEnhanceDOM: (dom) => {
+                  dom
+                    .querySelectorAll('a.u-url[target="_blank"]')
+                    .forEach((a) => {
+                      // Remove target="_blank" from links
+                      a.removeAttribute('target');
+                    });
+                },
               }),
             }}
           />
diff --git a/src/utils/enhance-content.js b/src/utils/enhance-content.js
index af3e8f6d..c048bbb3 100644
--- a/src/utils/enhance-content.js
+++ b/src/utils/enhance-content.js
@@ -1,7 +1,7 @@
 import emojifyText from './emojify-text';
 
 export default (content, opts = {}) => {
-  const { emojis } = opts;
+  const { emojis, postEnhanceDOM = () => {} } = opts;
   let enhancedContent = content;
   const dom = document.createElement('div');
   dom.innerHTML = enhancedContent;
@@ -27,7 +27,7 @@ export default (content, opts = {}) => {
     const pre = document.createElement('pre');
     const code = document.createElement('code');
     const breaks = block.querySelectorAll('br');
-    Array.from(breaks).forEach((br) => br.replaceWith('\n'));
+    breaks.forEach((br) => br.replaceWith('\n'));
     code.innerHTML = block.innerText
       .trim()
       // .replace(/^```/g, '')
@@ -37,6 +37,11 @@ export default (content, opts = {}) => {
     block.replaceWith(pre);
   });
 
+  if (postEnhanceDOM) {
+    postEnhanceDOM(dom); // mutate dom
+  }
+
   enhancedContent = dom.innerHTML;
+
   return enhancedContent;
 };