diff --git a/Packages/ohif-hotkeys/client/classes/HotkeysContext.js b/Packages/ohif-core/client/classes/HotkeysContext.js
similarity index 100%
rename from Packages/ohif-hotkeys/client/classes/HotkeysContext.js
rename to Packages/ohif-core/client/classes/HotkeysContext.js
diff --git a/Packages/ohif-hotkeys/client/classes/HotkeysManager.js b/Packages/ohif-core/client/classes/HotkeysManager.js
similarity index 100%
rename from Packages/ohif-hotkeys/client/classes/HotkeysManager.js
rename to Packages/ohif-core/client/classes/HotkeysManager.js
diff --git a/Packages/ohif-hotkeys/client/components/confirmReplacementPopover.html b/Packages/ohif-core/client/components/hotkeys/confirmReplacementPopover.html
similarity index 100%
rename from Packages/ohif-hotkeys/client/components/confirmReplacementPopover.html
rename to Packages/ohif-core/client/components/hotkeys/confirmReplacementPopover.html
diff --git a/Packages/ohif-hotkeys/client/components/form.html b/Packages/ohif-core/client/components/hotkeys/form.html
similarity index 100%
rename from Packages/ohif-hotkeys/client/components/form.html
rename to Packages/ohif-core/client/components/hotkeys/form.html
diff --git a/Packages/ohif-hotkeys/client/components/form.js b/Packages/ohif-core/client/components/hotkeys/form.js
similarity index 100%
rename from Packages/ohif-hotkeys/client/components/form.js
rename to Packages/ohif-core/client/components/hotkeys/form.js
diff --git a/Packages/ohif-hotkeys/client/components/formTable.html b/Packages/ohif-core/client/components/hotkeys/formTable.html
similarity index 100%
rename from Packages/ohif-hotkeys/client/components/formTable.html
rename to Packages/ohif-core/client/components/hotkeys/formTable.html
diff --git a/Packages/ohif-hotkeys/client/components/formTable.js b/Packages/ohif-core/client/components/hotkeys/formTable.js
similarity index 100%
rename from Packages/ohif-hotkeys/client/components/formTable.js
rename to Packages/ohif-core/client/components/hotkeys/formTable.js
diff --git a/Packages/ohif-hotkeys/client/components/index.js b/Packages/ohif-core/client/components/hotkeys/index.js
similarity index 100%
rename from Packages/ohif-hotkeys/client/components/index.js
rename to Packages/ohif-core/client/components/hotkeys/index.js
diff --git a/Packages/ohif-hotkeys/main.js b/Packages/ohif-core/client/hotkeys.js
similarity index 77%
rename from Packages/ohif-hotkeys/main.js
rename to Packages/ohif-core/client/hotkeys.js
index 9c359fe6e..043275d22 100644
--- a/Packages/ohif-hotkeys/main.js
+++ b/Packages/ohif-core/client/hotkeys.js
@@ -1,5 +1,5 @@
 import { OHIF } from 'meteor/ohif:core';
-import { HotkeysManager } from 'meteor/ohif:hotkeys/client/classes/HotkeysManager';
+import { HotkeysManager } from '/client/classes/HotkeysManager';
 import 'jquery.hotkeys';
 
 // Create hotkeys namespace using a HotkeysManager class instance
diff --git a/Packages/ohif-core/client/routes.js b/Packages/ohif-core/client/routes.js
index c63bd984a..4f69dca16 100644
--- a/Packages/ohif-core/client/routes.js
+++ b/Packages/ohif-core/client/routes.js
@@ -12,3 +12,16 @@ if (Meteor.isDevelopment) {
         this.render('componentPlayground');
     });
 }
+
+import { hotkeys } from 'meteor/ohif:hotkeys';
+
+Router.onBeforeAction(function() {
+    const lastRoute = Session.get('lastRoute');
+    const currentRoute = this.router.current().route.getName();
+    if (currentRoute !== lastRoute) {
+        hotkeys.switchToContext(null);
+        Session.set('lastRoute', currentRoute);
+    }
+
+    this.next();
+});