diff --git a/src/ui/control/attribution_control.js b/src/ui/control/attribution_control.js
index 6491a8bb76c..2d4a972b7c6 100644
--- a/src/ui/control/attribution_control.js
+++ b/src/ui/control/attribution_control.js
@@ -104,6 +104,7 @@ class AttributionControl {
                 return acc;
             }, `?`);
             editLink.href = `${config.FEEDBACK_URL}/${paramString}${this._map._hash ? this._map._hash.getHashString(true) : ''}`;
+            editLink.rel = "noopener";
         }
     }
 
diff --git a/src/ui/control/logo_control.js b/src/ui/control/logo_control.js
index 4466945ff8a..2d067c54c2d 100644
--- a/src/ui/control/logo_control.js
+++ b/src/ui/control/logo_control.js
@@ -29,6 +29,7 @@ class LogoControl {
         this._container = DOM.create('div', 'mapboxgl-ctrl');
         const anchor = DOM.create('a', 'mapboxgl-ctrl-logo');
         anchor.target = "_blank";
+        anchor.rel = "noopener";
         anchor.href = "https://www.mapbox.com/";
         anchor.setAttribute("aria-label", "Mapbox logo");
         anchor.setAttribute("rel", "noopener");