diff --git a/patterns/molecules/menu/js/menu.component.js b/patterns/molecules/menu/js/menu.component.js
index 4d44d68812ed1b8b1bece79ee73047f7180c1396..dab2931c0089a3b192202be96621dd8f296cfb6a 100644
--- a/patterns/molecules/menu/js/menu.component.js
+++ b/patterns/molecules/menu/js/menu.component.js
@@ -103,17 +103,20 @@
           if (("/"+currentlang) == previous_path) {
             break;
           }
-          matched_links = $('li.cern-dropdown').find('a[href^="'+ previous_path +'"]');
-          if ((matched_links.length > 1 && current_search != '') || matched_links.length == 1) {
+
+          matched_links = jQuery('li.cern-dropdown').find('a[href^="'+ previous_path +'"]');      
+          if ((matched_links.length > 1 && current_search != '') || matched_links.length == 1) {           
+            jQuery('li.cern-dropdown').find('a[href^="'+ previous_path + current_search + '"]').closest('.cern-submenu').find('.cernmenu-level-0 a').addClass('active-trail');         
+            jQuery('li.cern-dropdown').find('a[href^="'+ previous_path + current_search + '"]').addClass('active-trail');
             break;
+          } else {
+            if (i==0) {
+              matched_links.closest('.cern-submenu').find('.cernmenu-level-0 a').addClass('active-trail');
+            }
           }
-          current_path.pop();
+          current_path.pop();    
         }
-     
-        /*if (matched_links.length > 1  && current_search != '') {
-          var matched_links = $('li.cern-dropdown').find('a[href^="'+ previous_path + current_search +'"]');
-        }*/
-    
+        
         if (matched_links.length == 1) {
           // make a row children link active
           matched_links.eq(0).addClass('active-trail');
@@ -124,7 +127,6 @@
           matched_links.eq(0).closest('.cern-dropdown').find('a.dropdown-toggle').eq(0).addClass('active-trail');
         }
     }
-     
     /** END ACTIVE TRAIL */
     
 })(jQuery, Drupal);