diff --git a/Packages/lesiontracker/lib/pixelSpacingAutorunCheck.js b/Packages/lesiontracker/lib/pixelSpacingAutorunCheck.js
index e4d41086b..bb1811750 100644
--- a/Packages/lesiontracker/lib/pixelSpacingAutorunCheck.js
+++ b/Packages/lesiontracker/lib/pixelSpacingAutorunCheck.js
@@ -32,4 +32,16 @@ pixelSpacingAutorunCheck = function() {
         // Enable Lesion Buttons
         oncologyTools.prop('disabled', false);
     }
+
+    // Set disabled/enabled timepoint buttons
+    var imageId = enabledElement.image.imageId;
+    var study = cornerstoneTools.metaData.get('study', imageId);
+
+    // Find the relevant timepoint given the current study
+    var timepoint = Timepoints.findOne({
+        studyInstanceUids: {
+            $in: [study.studyInstanceUid]
+        }
+    });
+    setTimepointTools(timepoint);
 };
\ No newline at end of file
diff --git a/Packages/lesiontracker/lib/timepointAutoCheck.js b/Packages/lesiontracker/lib/timepointAutoCheck.js
index 707d2b331..67d2ab6d4 100644
--- a/Packages/lesiontracker/lib/timepointAutoCheck.js
+++ b/Packages/lesiontracker/lib/timepointAutoCheck.js
@@ -3,14 +3,19 @@ setTimepointTools = function(timepoint) {
 
     // Enabled tools for only follow-up tools
     var fuTools = ["button#crunexTools"];
+    var fuToolsJQ = $("button#crunexTools");
+    var isDisabled = false;
     if ((timepoint.timepointType).toLowerCase() === "baseline") {
         // Set active tool as lesion tool
         toolManager.setActiveTool('bidirectional');
-        toolManager.addDisabledTool({tools: fuTools, status: true});
+        isDisabled = true;
     } else {
         toolManager.setActiveTool(toolManager.getDefaultTool());
-        toolManager.addDisabledTool({tools: fuTools, status: false});
+        isDisabled = false;
     }
+
+    toolManager.addDisabledTool({tools: fuTools, status: isDisabled});
+    fuToolsJQ.prop('disabled', isDisabled);
 };
 
 timepointAutoCheck = function(templateData) {
diff --git a/Packages/viewerbase/client/components/viewer/toolbar/toolbar.js b/Packages/viewerbase/client/components/viewer/toolbar/toolbar.js
index 468e0c347..dbe24b54f 100644
--- a/Packages/viewerbase/client/components/viewer/toolbar/toolbar.js
+++ b/Packages/viewerbase/client/components/viewer/toolbar/toolbar.js
@@ -158,7 +158,7 @@ Template.toolbar.onRendered(function() {
     var extraTooltipButtons = $('[rel="tooltip"]');
     extraTooltipButtons.tooltip(OHIF.viewer.tooltipConfig);
 
-    // Set disabled/enabled tool buttons
+    // Set disabled/enabled tool buttons that are set in toolManager
     setButtonsDisability();
 });
 
diff --git a/Packages/viewerbase/client/components/viewer/toolbarGroupButton/toolbarGroupButton.styl b/Packages/viewerbase/client/components/viewer/toolbarGroupButton/toolbarGroupButton.styl
index 44030d6ee..ff255656e 100644
--- a/Packages/viewerbase/client/components/viewer/toolbarGroupButton/toolbarGroupButton.styl
+++ b/Packages/viewerbase/client/components/viewer/toolbarGroupButton/toolbarGroupButton.styl
@@ -1,4 +1,8 @@
 #toolbarGroupButton
+  button
+    &.active, &:active
+      background-color: #3B678E
+
   .dropdown-menu
     background-color: black
     border: solid 1px #333