diff --git a/app/assets/javascripts/discourse/controllers/topic_controller.js b/app/assets/javascripts/discourse/controllers/topic_controller.js
index 2b25d5f149d..42443d40c19 100644
--- a/app/assets/javascripts/discourse/controllers/topic_controller.js
+++ b/app/assets/javascripts/discourse/controllers/topic_controller.js
@@ -254,6 +254,17 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
     this.get('content').destroy(Discourse.User.current());
   },
 
+  resetRead: function() {
+    Discourse.ScreenTrack.instance().reset();
+    this.unsubscribe();
+
+    var topicController = this;
+    this.get('model').resetRead().then(function() {
+      topicController.set('message', I18n.t("topic.read_position_reset"));
+      topicController.set('postStream.loaded', false);
+    });
+  },
+
   toggleVisibility: function() {
     this.get('content').toggleStatus('visible');
   },
diff --git a/app/assets/javascripts/discourse/templates/topic_admin_menu.js.handlebars b/app/assets/javascripts/discourse/templates/topic_admin_menu.js.handlebars
index fe88adc262c..518e73caa3d 100644
--- a/app/assets/javascripts/discourse/templates/topic_admin_menu.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic_admin_menu.js.handlebars
@@ -46,14 +46,14 @@
         {{/if}}
       </li>
 
-      {{#if view.topic.canConvertToRegular}}
+      {{#if canConvertToRegular}}
       <li>
           <button {{action convertToRegular}} class='btn btn-admin'><i class='icon-minus'></i> {{i18n topic.actions.convert_to_topic}}</button>
       </li>
       {{/if}}
 
       <li>
-        <button class='btn btn-admin' {{action resetRead target="view.parentView"}}><i class='icon-remove'></i> {{i18n topic.actions.reset_read}}</button>
+        <button class='btn btn-admin' {{action resetRead}}><i class='icon-remove'></i> {{i18n topic.actions.reset_read}}</button>
       </li>
     </ul>
   </div>
diff --git a/app/assets/javascripts/discourse/views/topic_view.js b/app/assets/javascripts/discourse/views/topic_view.js
index 33e1c1b1789..14f0846831b 100644
--- a/app/assets/javascripts/discourse/views/topic_view.js
+++ b/app/assets/javascripts/discourse/views/topic_view.js
@@ -142,17 +142,6 @@ Discourse.TopicView = Discourse.View.extend(Discourse.Scrolling, {
     this.debounceLoadSuggested();
   }.observes('topicTrackingState.incomingCount'),
 
-  resetRead: function(e) {
-    Discourse.ScreenTrack.instance().reset();
-    this.get('controller').unsubscribe();
-
-    var topicView = this;
-    this.get('topic').resetRead().then(function() {
-      topicView.set('controller.message', I18n.t("topic.read_position_reset"));
-      topicView.set('controller.loaded', false);
-    });
-  },
-
   gotFocus: function(){
     if (Discourse.get('hasFocus')){
       this.scrolled();