| Index: chrome/browser/resources/settings/settings_page/main_page_behavior.js
|
| diff --git a/chrome/browser/resources/settings/settings_page/main_page_behavior.js b/chrome/browser/resources/settings/settings_page/main_page_behavior.js
|
| index 600499e704e72bcd590b9649e15e087b4fd2290b..c38ae43f347c89c58264a6cac18b83c697aeb6f6 100644
|
| --- a/chrome/browser/resources/settings/settings_page/main_page_behavior.js
|
| +++ b/chrome/browser/resources/settings/settings_page/main_page_behavior.js
|
| @@ -290,10 +290,12 @@ var MainPageBehaviorImpl = {
|
| this.getSection(settings.getCurrentRoute().section);
|
|
|
| // Scroll to the new section or the original position.
|
| - if (newSection && !settings.lastRouteChangeWasPopstate())
|
| + if (newSection && !settings.lastRouteChangeWasPopstate() &&
|
| + !settings.getCurrentRoute().isSubpage()) {
|
| newSection.scrollIntoView();
|
| - else
|
| + } else {
|
| this.scroller.scrollTop = this.origScrollTop_;
|
| + }
|
|
|
| this.currentAnimation_ = section.animateCollapse(
|
| /** @type {!HTMLElement} */(this.scroller));
|
|
|