diff --git a/app/assets/javascripts/discourse/views/discovery_topics_view.js b/app/assets/javascripts/discourse/views/discovery_topics_view.js
index 00b9528bace..311916fdd99 100644
--- a/app/assets/javascripts/discourse/views/discovery_topics_view.js
+++ b/app/assets/javascripts/discourse/views/discovery_topics_view.js
@@ -7,7 +7,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.DiscoveryTopicsView = Discourse.View.extend(Discourse.ScrollTop, Discourse.LoadMore, {
+Discourse.DiscoveryTopicsView = Discourse.View.extend(Discourse.LoadMore, {
   eyelineSelector: '.topic-list-item',
 
   actions: {
@@ -25,6 +25,15 @@ Discourse.DiscoveryTopicsView = Discourse.View.extend(Discourse.ScrollTop, Disco
     }
   },
 
+  _readjustScrollPosition: function() {
+    var scrollTo = Discourse.Session.currentProp('topicListScrollPosition');
+    if (scrollTo) {
+      Em.run.schedule('afterRender', function() {
+        $(window).scrollTop(scrollTo);
+      });
+    }
+  }.on('didInsertElement'),
+
   _updateTitle: function() {
     Discourse.notifyTitle(this.get('controller.topicTrackingState.incomingCount'));
   }.observes('controller.topicTrackingState.incomingCount'),