diff --git a/client/src/components/categorical/category.js b/client/src/components/categorical/category.js
index 4fda6da9..67952354 100644
--- a/client/src/components/categorical/category.js
+++ b/client/src/components/categorical/category.js
@@ -241,11 +241,10 @@ class Category extends React.Component {
             <Button
               data-testclass="colorby"
               data-testid={`colorby-${metadataField}`}
-              onClick={() => {
-                if (!isTruncated) this.handleColorChange();
-              }}
-              active={colorAccessor === metadataField || isTruncated}
-              intent={colorAccessor === metadataField && !isTruncated ? "primary" : "none"}
+              onClick={this.handleColorChange}
+              active={colorAccessor === metadataField}
+              intent={colorAccessor === metadataField ? "primary" : "none"}
+              disabled={isTruncated}
               icon="tint"
             />
           </Tooltip>
diff --git a/client/src/components/menubar/subset.js b/client/src/components/menubar/subset.js
index aa09374f..abde1b81 100644
--- a/client/src/components/menubar/subset.js
+++ b/client/src/components/menubar/subset.js
@@ -20,11 +20,9 @@ function Subset(props) {
       >
         <AnchorButton
           data-testid="subset-button"
-          active={!subsetPossible}
+          disabled={!subsetPossible}
           icon="pie-chart"
-          onClick={() => {
-            if (subsetPossible) handleSubset();
-          }}
+          onClick={handleSubset}
         />
       </Tooltip>
       <Tooltip
@@ -34,11 +32,9 @@ function Subset(props) {
       >
         <AnchorButton
           data-testid="reset-subset-button"
-          active={!subsetResetPossible}
+          disabled={!subsetResetPossible}
           icon="full-circle"
-          onClick={() => {
-            if (subsetResetPossible) handleSubsetReset();
-          }}
+          onClick={handleSubsetReset}
         />
       </Tooltip>
     </ButtonGroup>