diff --git a/web/pgadmin/static/js/sqleditor/macro.js b/web/pgadmin/static/js/sqleditor/macro.js
index b761002fc..b476cd6be 100644
--- a/web/pgadmin/static/js/sqleditor/macro.js
+++ b/web/pgadmin/static/js/sqleditor/macro.js
@@ -10,6 +10,7 @@
 import gettext from 'sources/gettext';
 import url_for from 'sources/url_for';
 import $ from 'jquery';
+import _ from 'underscore';
 import Alertify from 'pgadmin.alertifyjs';
 import pgAdmin from 'sources/pgadmin';
 import Backform from 'pgadmin.backform';
@@ -269,16 +270,16 @@ let MacroDialog = {
                     var str = `
                       <li>
                           <a class="dropdown-item" id="btn-manage-macros" href="#" tabindex="0">
-                              <span> Manage Macros... </span>
+                              <span> ${gettext('Manage Macros...')} </span>
                           </a>
                       </li>
                       <li class="dropdown-divider"></li>`;
                     _.each(macros, function(m) {
                       if (m.name) {
                         str += `<li>
-                        <a class="dropdown-item btn-macro" data-macro-id="`+ m.id +`" href="#" tabindex="0">
-                            <span>` + m.name + `</span>
-                            <span> (` + m.key_label + `) </span>
+                        <a class="dropdown-item btn-macro" data-macro-id="${m.id}" href="#" tabindex="0">
+                            <span> ${_.escape(m.name)} </span>
+                            <span> (${m.key_label}) </span>
                         </a>
                        </li>`;
                       }
diff --git a/web/pgadmin/tools/datagrid/templates/datagrid/index.html b/web/pgadmin/tools/datagrid/templates/datagrid/index.html
index 4970027e9..229b4d37e 100644
--- a/web/pgadmin/tools/datagrid/templates/datagrid/index.html
+++ b/web/pgadmin/tools/datagrid/templates/datagrid/index.html
@@ -395,7 +395,7 @@
                     {% for i in macros %}
                     <li>
                         <a class="dropdown-item btn-macro" data-macro-id="{{ i.id }}" href="#" tabindex="0">
-                            <span> {{ _(i.name) }} </span>
+                            <span> {{ _(i.name)|e }} </span>
                             <span> ({{ i.key_label }}) </span>
                         </a>
                     </li>