diff --git a/LesionTracker/client/components/viewer/viewer.js b/LesionTracker/client/components/viewer/viewer.js
index 468593d51..9afdada52 100644
--- a/LesionTracker/client/components/viewer/viewer.js
+++ b/LesionTracker/client/components/viewer/viewer.js
@@ -31,12 +31,6 @@ Template.viewer.onCreated(() => {
         }
     });
 
-    // The hotkey can also be an array (e.g. ["NUMPAD0", "0"])
-    OHIF.viewer.defaultHotkeys = OHIF.viewer.defaultHotkeys || {};
-    OHIF.viewer.defaultHotkeys.toggleLesionTrackerTools = 'O';
-    OHIF.viewer.defaultHotkeys.bidirectional = 'T'; // Target
-    OHIF.viewer.defaultHotkeys.nonTarget = 'N'; // Non-target
-
     if (ViewerData[contentId].loadedSeriesData) {
         OHIF.log.info('Reloading previous loadedSeriesData');
         OHIF.viewer.loadedSeriesData = ViewerData[contentId].loadedSeriesData;
diff --git a/Packages/ohif-lesiontracker/client/lib/toggleLesionTrackerTools.js b/Packages/ohif-lesiontracker/client/lib/toggleLesionTrackerTools.js
index 6dd34e112..0e2d89d38 100644
--- a/Packages/ohif-lesiontracker/client/lib/toggleLesionTrackerTools.js
+++ b/Packages/ohif-lesiontracker/client/lib/toggleLesionTrackerTools.js
@@ -47,9 +47,11 @@ OHIF.lesiontracker.toggleLesionTrackerToolsButtons = (isEnabled) => {
 
     if (isEnabled) {
         toolStates.disabledToolButtons = [];
+        OHIF.lesiontracker.toggleLesionTrackerToolsHotKeys(true);
     } else {
         toolStates.disabledToolButtons = [ 'bidirectional', 'nonTarget', 'crTool', 'unTool', 'exTool',
             'toggleHUD', 'toggleTrial', 'toolbarSectionEntry', 'toggleMeasurements' ];
+        OHIF.lesiontracker.toggleLesionTrackerToolsHotKeys(false);
     }
 
     // Reload the updated previous or default states
@@ -59,4 +61,19 @@ OHIF.lesiontracker.toggleLesionTrackerToolsButtons = (isEnabled) => {
     if (!isEnabled) {
         toolManager.setActiveTool();
     }
-};
\ No newline at end of file
+};
+
+OHIF.lesiontracker.toggleLesionTrackerToolsHotKeys = (isEnabled) => {
+    // The hotkey can also be an array (e.g. ["NUMPAD0", "0"])
+    OHIF.viewer.defaultHotkeys = OHIF.viewer.defaultHotkeys || {};
+
+    if (isEnabled) {
+        OHIF.viewer.defaultHotkeys.toggleLesionTrackerTools = 'O';
+        OHIF.viewer.defaultHotkeys.bidirectional = 'T'; // Target
+        OHIF.viewer.defaultHotkeys.nonTarget = 'N'; // Non-target
+    } else {
+        OHIF.viewer.defaultHotkeys.toggleLesionTrackerTools = null;
+        OHIF.viewer.defaultHotkeys.bidirectional = null; // Target
+        OHIF.viewer.defaultHotkeys.nonTarget = null; // Non-target
+    }
+};