diff --git a/src/data-table/data-cell.jsx b/src/data-table/data-cell.jsx
index c82b5f4..a74f0d4 100644
--- a/src/data-table/data-cell.jsx
+++ b/src/data-table/data-cell.jsx
@@ -113,9 +113,11 @@ class DataCell extends React.Component {
       general,
       measurement,
       styleBuilder,
-      styling
+      styling,
+      qlik
     } = this.props;
 
+    const inEditState = qlik.inEditState();
     const isColumnPercentageBased = measurement.name.substring(0, 1) === '%';
     let formattedMeasurementValue = formatMeasurementValue(measurement, styling);
     if (styleBuilder.hasComments()) {
@@ -159,7 +161,7 @@ class DataCell extends React.Component {
         style={cellStyle}
       >
         {formattedMeasurementValue}
-        {bool
+        {bool && !inEditState
           ?
           <Tooltip
             data={formattedMeasurementValue}