1 files changed, 12 insertions, 3 deletions
diff --git a/chromium/chrome/browser/resources/settings/settings_menu/settings_menu.js b/chromium/chrome/browser/resources/settings/settings_menu/settings_menu.js
index 38bce70ccb4..c604ae4bcbf 100644
--- a/chromium/chrome/browser/resources/settings/settings_menu/settings_menu.js
+++ b/chromium/chrome/browser/resources/settings/settings_menu/settings_menu.js
@@ -27,12 +27,12 @@ Polymer({
 
   /** @param {!settings.Route} newRoute */
   currentRouteChanged: function(newRoute) {
-    const currentPath = newRoute.path;
-
     // Focus the initially selected path.
     const anchors = this.root.querySelectorAll('a');
     for (let i = 0; i < anchors.length; ++i) {
-      if (anchors[i].getAttribute('href') == currentPath) {
+      const anchorRoute =
+          settings.router.getRouteForPath(anchors[i].getAttribute('href'));
+      if (anchorRoute && anchorRoute.contains(newRoute)) {
         this.setSelectedUrl_(anchors[i].href);
         return;
       }
@@ -95,4 +95,13 @@ Polymer({
     chrome.metricsPrivate.recordUserAction(
         'SettingsMenu_ExtensionsLinkClicked');
   },
+
+  /**
+   * @param {boolean} bool
+   * @return {string}
+   * @private
+   */
+  boolToString_: function(bool) {
+    return bool.toString();
+  },
 });