diff --git a/DancingGoat/TagHelpers/EditLinkTagHelper.cs b/DancingGoat/TagHelpers/EditLinkTagHelper.cs
index 7a030e4..b672ddd 100644
--- a/DancingGoat/TagHelpers/EditLinkTagHelper.cs
+++ b/DancingGoat/TagHelpers/EditLinkTagHelper.cs
@@ -31,6 +31,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
 
             output.TagName = "a";
             output.Attributes.SetAttribute("target", "_blank");
+            output.Attributes.SetAttribute("rel", "noopener");
             output.Attributes.SetAttribute("href", itemUrl);
             output.Attributes.Add("class", $"edit-link__overlay--{style}");
             output.TagMode = TagMode.StartTagAndEndTag;
diff --git a/DancingGoat/TagHelpers/EditPanelTagHelper.cs b/DancingGoat/TagHelpers/EditPanelTagHelper.cs
index 758a252..b67e2f6 100644
--- a/DancingGoat/TagHelpers/EditPanelTagHelper.cs
+++ b/DancingGoat/TagHelpers/EditPanelTagHelper.cs
@@ -47,7 +47,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
         </div>
     </div>
     <div class=""edit-mode-panel__navigate-link"">
-        <a target=""_blank"" href=""{itemUrl}"">Open content item in Kontent</a>
+        <a target=""_blank"" rel=""noopener"" href=""{itemUrl}"">Open content item in Kontent</a>
     </div>";
                 output.Content.SetHtmlContent(html);