diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
index 8a598edbca9..816767473f8 100644
--- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
+++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
@@ -92,7 +92,7 @@ export default {
     const topic = this.currentTopic();
     // BIG hack, need a cleaner way
     if (topic && $('.posts-wrapper').length > 0) {
-      topic.toggleBookmark();
+      this.container.lookup('controller:topic').send('toggleBookmark');
     } else {
       this.sendToTopicListItemView('toggleBookmark');
     }