diff --git a/app/assets/javascripts/discourse/components/topic-list-item.js.es6 b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
index 21d7b3afee4..943a7b66226 100644
--- a/app/assets/javascripts/discourse/components/topic-list-item.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-list-item.js.es6
@@ -10,10 +10,7 @@ export default Ember.Component.extend(StringBuffer, {
 
   actions: {
     toggleBookmark() {
-      const self = this;
-      this.get('topic').toggleBookmark().finally(function() {
-        self.rerender();
-      });
+      this.get('topic').toggleBookmark().finally(() => this.rerender());
     }
   },
 
diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index ef505ebe8e8..f44bc3c40ae 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -294,10 +294,6 @@ export default {
       $articles.removeClass('selected');
       $article.addClass('selected');
 
-      if ($article.is('.topic-list-item')) {
-        this.sendToTopicListItemView('select');
-      }
-
       if ($article.is('.topic-post')) {
         $('a.tabLoc', $article).focus();
       }