diff --git a/assets/js/theme/global/currency-selector.js b/assets/js/theme/global/currency-selector.js
index 63b72ba665..9393ce49c4 100644
--- a/assets/js/theme/global/currency-selector.js
+++ b/assets/js/theme/global/currency-selector.js
@@ -19,11 +19,7 @@ export default function (cartId) {
         });
     }
 
-    $(document.body).on('click', '.currencySelector', () => {
-        $('.currency-selection-list').toggleClass('active');
-    });
-
-    $(document.body).on('click', '[data-cart-currency-switch-url]', event => {
+    $('[data-cart-currency-switch-url]').on('click', event => {
         const currencySessionSwitcher = event.target.href;
         if (!cartId) {
             return;
diff --git a/templates/components/common/currency-selector.html b/templates/components/common/currency-selector.html
index 57c3c7a289..71a7874613 100644
--- a/templates/components/common/currency-selector.html
+++ b/templates/components/common/currency-selector.html
@@ -1,7 +1,19 @@
 {{#if currency_selector.currencies.length '>' 1}}
 <ul class="navUser-section">
     <li class="navUser-item">
-        <a class="navUser-action navUser-action--currencySelector has-dropdown" href="#" data-dropdown="currencySelection" aria-controls="currencySelection" aria-expanded="false">{{lang 'common.currency' code=currency_selector.active_currency_code}} <i class="icon" aria-hidden="true"><svg><use xlink:href="#icon-chevron-down" /></svg></i></a>
+        <a class="navUser-action navUser-action--currencySelector has-dropdown"
+           href="#"
+           data-dropdown="currencySelection"
+           aria-controls="currencySelection"
+           aria-expanded="false"
+        >
+            {{lang 'common.currency' code=currency_selector.active_currency_code}}
+            <i class="icon" aria-hidden="true">
+                <svg>
+                    <use xlink:href="#icon-chevron-down" />
+                </svg>
+            </i>
+        </a>
         <ul class="dropdown-menu" id="currencySelection" data-dropdown-content aria-hidden="true" tabindex="-1">
             {{#each currency_selector.currencies}}
             <li class="dropdown-menu-item">
@@ -13,9 +25,9 @@
                    data-warning="{{lang 'common.currency_switch_promotion'}}"
                 >
                 {{#if is_active}}
-                <strong>{{name}}</strong>
+                    <strong>{{name}}</strong>
                 {{else}}
-                {{name}}
+                    {{name}}
                 {{/if}}
                 </a>
             </li>
diff --git a/templates/components/common/navigation-menu.html b/templates/components/common/navigation-menu.html
index e725f0651e..43baf2f08e 100644
--- a/templates/components/common/navigation-menu.html
+++ b/templates/components/common/navigation-menu.html
@@ -50,6 +50,11 @@
                             <a class="navPage-subMenu-action navPages-action"
                                href="{{{switch_url}}}"
                                aria-label="{{name}}"
+                               data-currency-code="{{{code}}}"
+                               {{#if cart_currency_switch_url.length '>' 0 }}
+                               data-cart-currency-switch-url="{{{cart_currency_switch_url}}}"
+                               {{/if}}
+                               data-warning="{{lang 'common.currency_switch_promotion'}}"
                             >
                                 {{#if is_active}}
                                     <strong>{{name}}</strong>