diff --git a/app/assets/javascripts/discourse/lib/discourse-location.js.es6 b/app/assets/javascripts/discourse/lib/discourse-location.js.es6
index 48e7ef4aa..43b74ab1e 100644
--- a/app/assets/javascripts/discourse/lib/discourse-location.js.es6
+++ b/app/assets/javascripts/discourse/lib/discourse-location.js.es6
@@ -31,7 +31,12 @@ const DiscourseLocation = Ember.Object.extend({
     @method initState
   */
   initState() {
-    set(this, 'history', get(this, 'history') || window.history);
+    const history = get(this, 'history') || window.history;
+    if (history && history.scrollRestoration) {
+      history.scrollRestoration = "manual";
+    }
+
+    set(this, 'history', history);
 
     let url = this.formatURL(this.getURL());
     const loc = get(this, 'location');