diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b6c88c7b314..255a2fea449b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,9 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 ### Deprecations
 
 ### 🛡 Security
+
 * [CVE-2022-0144] Bump shelljs from 0.8.4 to 0.8.5 ([#2511](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2511))
+* [Legacy Maps Plugin] Prevent reverse-tabnabbing ([#2540](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2540))
 * [CVE-2022-0155] Bump follow-redirects to 1.15.2 [#2653](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2653))
 * [CVE-2022-0536] Bump follow-redirects to 1.15.2 [#2653](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2653))
 
diff --git a/src/plugins/maps_legacy/public/map/map_messages.js b/src/plugins/maps_legacy/public/map/map_messages.js
index 7a580681d0af..1c1701812d17 100644
--- a/src/plugins/maps_legacy/public/map/map_messages.js
+++ b/src/plugins/maps_legacy/public/map/map_messages.js
@@ -34,7 +34,7 @@
 import React, { Fragment } from 'react';
 import ReactDOM from 'react-dom';
 import { FormattedMessage } from '@osd/i18n/react';
-import { EuiSpacer, EuiButtonEmpty, EuiEmptyPrompt } from '@elastic/eui';
+import { EuiSpacer, EuiButtonEmpty, EuiEmptyPrompt, EuiLink } from '@elastic/eui';
 import { toMountPoint } from '../../../opensearch_dashboards_react/public';
 
 export const createRegionBlockedWarning = (function () {
@@ -114,9 +114,12 @@ export const createZoomWarningMsg = (function () {
               Please go to { wms } for more information."
               values={{
                 wms: (
-                  <a target="_blank" href="https://opensearch.org/docs/latest/dashboards/maptiles/">
+                  <EuiLink
+                    target="_blank"
+                    href="https://opensearch.org/docs/latest/dashboards/maptiles/"
+                  >
                     {`Custom WMS Configuration`}
-                  </a>
+                  </EuiLink>
                 ),
               }}
             />