diff --git a/src/data-table/header-padding.jsx b/src/data-table/header-padding.jsx
index 45daea5..b4ab165 100644
--- a/src/data-table/header-padding.jsx
+++ b/src/data-table/header-padding.jsx
@@ -4,8 +4,7 @@ import PropTypes from 'prop-types';
 const HeaderPadding = ({ styleBuilder, styling }) => {
   if (styling.usePadding && !styleBuilder.hasCustomFileStyle()) {
     const paddingStyle = {
-      fontFamily: styling.options.fontFamily,
-      marginLeft: '15px'
+      fontFamily: styling.options.fontFamily
     };
     return (
       <span style={paddingStyle} />
diff --git a/src/data-table/row-header.jsx b/src/data-table/row-header.jsx
index 06da248..2abea0b 100644
--- a/src/data-table/row-header.jsx
+++ b/src/data-table/row-header.jsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import HeaderPadding from './header-padding.jsx';
+import Tooltip from '../tooltip/index.jsx';
 
 class RowHeader extends React.PureComponent {
   constructor (props) {
@@ -15,7 +16,9 @@ class RowHeader extends React.PureComponent {
   }
 
   render () {
-    const { entry, rowStyle, styleBuilder, styling } = this.props;
+    const { entry, rowStyle, styleBuilder, styling, qlik } = this.props;
+    const inEditState = qlik.inEditState();
+
     return (
       <td
         className="fdim-cells"
@@ -26,7 +29,12 @@ class RowHeader extends React.PureComponent {
           styleBuilder={styleBuilder}
           styling={styling}
         />
-        {entry.displayValue}
+        <Tooltip
+          isTooltipActive={!inEditState}
+          tooltipText={entry.displayValue}
+        >
+          {entry.displayValue}
+        </Tooltip>
       </td>
     );
   }
diff --git a/src/main.less b/src/main.less
index 48d9146..0b59fa5 100644
--- a/src/main.less
+++ b/src/main.less
@@ -28,7 +28,7 @@
     min-width: 25px;
     position: fixed;
     padding: 5px;
-    padding-top: 15px;
+    padding-top: 8px;
     background-color: #404040;
     z-index: 100;
     pointer-events: none;
@@ -83,6 +83,12 @@
     text-overflow: ellipsis;
     vertical-align: middle;
     cursor: default;
+
+    > div {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
   }
 
   .empty {
@@ -271,6 +277,10 @@
     }
   }
 
+  .row-wrapper .fdim-cells {
+    padding-left: 12px;
+  }
+
   .data-table {
     height: 100%;
     width: calc(100% - 243px);