diff --git a/OHIFViewer/client/components/viewer/viewer.js b/OHIFViewer/client/components/viewer/viewer.js
index f9940eecd..c98be9f74 100644
--- a/OHIFViewer/client/components/viewer/viewer.js
+++ b/OHIFViewer/client/components/viewer/viewer.js
@@ -82,7 +82,16 @@ Template.viewer.onCreated(function() {
     OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('CornerstoneNewImage', cornerstoneTools.updateImageSynchronizer);
 });
 
+Template.viewer.onRendered(function() {
+    // Enable hotkeys
+    enableHotkeys();
+});
+
 Template.viewer.onDestroyed(function() {
     log.info('onDestroyed');
+
+    // Remove the Window resize listener
+    $(window).off('resize', handleResize);
+
     OHIF.viewer.updateImageSynchronizer.destroy();
 });