diff --git a/app/back-end/builddata.json b/app/back-end/builddata.json
index cee71d733..f961a4038 100644
--- a/app/back-end/builddata.json
+++ b/app/back-end/builddata.json
@@ -1 +1 @@
-{"version":"0.34.0","build":11730,"status":"Beta"}
\ No newline at end of file
+{"version":"0.34.0","build":11733,"status":"Beta"}
\ No newline at end of file
diff --git a/app/src/components/post-editor/InlineEditor.vue b/app/src/components/post-editor/InlineEditor.vue
index 23cb5bbe2..fcfd1e8c0 100644
--- a/app/src/components/post-editor/InlineEditor.vue
+++ b/app/src/components/post-editor/InlineEditor.vue
@@ -89,6 +89,12 @@ export default {
 
                 if (response.rel) {
                     relAttr = ' rel="nofollow"';
+
+                    if (response.target.indexOf('_blank') > -1) {
+                        relAttr = ' rel="nofollow noopener noreferrer"';
+                    }
+                } else if (response.target.indexOf('_blank') > -1) {
+                    relAttr = ' rel="noopener noreferrer"';
                 }
 
                 let linkHTML = `<a href="${response.url}"${response.title}${response.target}${relAttr}>${response.text}</a>`;
diff --git a/app/src/components/post-editor/LinkPopup.vue b/app/src/components/post-editor/LinkPopup.vue
index 6c6412660..d371ffa84 100644
--- a/app/src/components/post-editor/LinkPopup.vue
+++ b/app/src/components/post-editor/LinkPopup.vue
@@ -269,7 +269,7 @@ export default {
                 }
             }
 
-            if (relContent && relContent[1]) {
+            if (relContent && relContent[1].indexOf('nofollow') > -1) {
                 this.rel = true;
             }
         },
diff --git a/app/src/components/post-editor/LinkToolbar.vue b/app/src/components/post-editor/LinkToolbar.vue
index a78ceb26b..78e1dd9a0 100644
--- a/app/src/components/post-editor/LinkToolbar.vue
+++ b/app/src/components/post-editor/LinkToolbar.vue
@@ -46,6 +46,12 @@ export default {
 
                 if (response.rel) {
                     relAttr = ' rel="nofollow"';
+
+                    if (response.target.indexOf('_blank') > -1) {
+                        relAttr = ' rel="nofollow noopener noreferrer"';
+                    }
+                } else if (response.target.indexOf('_blank') > -1) {
+                    relAttr = ' rel="noopener noreferrer"';
                 }
 
                 let linkHTML = `<a href="${response.url}"${response.title}${response.target}${relAttr}>${response.text}</a>`;