diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.tsx
index 2710f7ebd18f9..485919099069d 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/OptionWrapper.tsx
@@ -122,10 +122,7 @@ export default function OptionWrapper(
   });
 
   const shouldShowTooltip =
-    (!isDragging &&
-      tooltipTitle &&
-      label &&
-      tooltipTitle.length > label.length) ||
+    (!isDragging && tooltipTitle && label && tooltipTitle !== label) ||
     (!isDragging &&
       labelRef &&
       labelRef.current &&
diff --git a/superset-frontend/src/explore/components/controls/OptionControls/index.tsx b/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
index 7e1ec07a86c06..c68b3685c0121 100644
--- a/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
+++ b/superset-frontend/src/explore/components/controls/OptionControls/index.tsx
@@ -261,10 +261,15 @@ export const OptionControlLabel = ({
 
   const getLabelContent = () => {
     const shouldShowTooltip =
-      !isDragging &&
-      labelRef &&
-      labelRef.current &&
-      labelRef.current.scrollWidth > labelRef.current.clientWidth;
+      (!isDragging &&
+        typeof label === 'string' &&
+        tooltipTitle &&
+        label &&
+        tooltipTitle !== label) ||
+      (!isDragging &&
+        labelRef &&
+        labelRef.current &&
+        labelRef.current.scrollWidth > labelRef.current.clientWidth);
 
     if (savedMetric && hasMetricName) {
       return (