diff --git a/app/assets/javascripts/discourse.js.es6 b/app/assets/javascripts/discourse.js.es6
index a05df2f5ae6..3ad77043a0b 100644
--- a/app/assets/javascripts/discourse.js.es6
+++ b/app/assets/javascripts/discourse.js.es6
@@ -1,3 +1,4 @@
+/*global Mousetrap:true*/
 import { buildResolver } from "discourse-common/resolver";
 import {
   default as computed,
@@ -15,6 +16,12 @@ const Discourse = Ember.Application.extend({
     paste: "paste"
   },
 
+  reset() {
+    this._super(...arguments);
+
+    Mousetrap.reset();
+  },
+
   getURL(url) {
     if (!url) return url;