diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/__snapshots__/feature_properties.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/__snapshots__/feature_properties.test.tsx.snap
index 951f65da05df0..12ed9e96b5a9b 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/__snapshots__/feature_properties.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/__snapshots__/feature_properties.test.tsx.snap
@@ -1,44 +1,48 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`FeatureProperties should render 1`] = `
-<table
-  className="eui-yScrollWithShadows mapFeatureTooltip_table"
+<div
+  className="mapFeatureTooltip_tableWrapper"
 >
-  <tbody>
-    <tr
-      className="mapFeatureTooltip_row"
-      key="prop1"
-    >
-      <td
-        className="eui-textBreakWord mapFeatureTooltip__propertyLabel"
+  <table
+    className="eui-yScrollWithShadows mapFeatureTooltip_table"
+  >
+    <tbody>
+      <tr
+        className="mapFeatureTooltip_row"
+        key="prop1"
       >
-        prop1
-      </td>
-      <td
-        className="eui-textBreakWord"
-      >
-        foobar1
-      </td>
-      <td />
-    </tr>
-    <tr
-      className="mapFeatureTooltip_row"
-      key="prop2"
-    >
-      <td
-        className="eui-textBreakWord mapFeatureTooltip__propertyLabel"
-      >
-        prop2
-      </td>
-      <td
-        className="eui-textBreakWord"
+        <td
+          className="eui-textBreakWord mapFeatureTooltip__propertyLabel"
+        >
+          prop1
+        </td>
+        <td
+          className="eui-textBreakWord"
+        >
+          foobar1
+        </td>
+        <td />
+      </tr>
+      <tr
+        className="mapFeatureTooltip_row"
+        key="prop2"
       >
-        foobar2
-      </td>
-      <td />
-    </tr>
-  </tbody>
-</table>
+        <td
+          className="eui-textBreakWord mapFeatureTooltip__propertyLabel"
+        >
+          prop2
+        </td>
+        <td
+          className="eui-textBreakWord"
+        >
+          foobar2
+        </td>
+        <td />
+      </tr>
+    </tbody>
+  </table>
+</div>
 `;
 
 exports[`FeatureProperties should show error message if unable to load tooltip content 1`] = `
@@ -55,81 +59,28 @@ exports[`FeatureProperties should show error message if unable to load tooltip c
 `;
 
 exports[`FeatureProperties should show filter button for filterable properties 1`] = `
-<table
-  className="eui-yScrollWithShadows mapFeatureTooltip_table"
+<div
+  className="mapFeatureTooltip_tableWrapper"
 >
-  <tbody>
-    <tr
-      className="mapFeatureTooltip_row"
-      key="prop1"
-    >
-      <td
-        className="eui-textBreakWord mapFeatureTooltip__propertyLabel"
-      >
-        prop1
-      </td>
-      <td
-        className="eui-textBreakWord"
+  <table
+    className="eui-yScrollWithShadows mapFeatureTooltip_table"
+  >
+    <tbody>
+      <tr
+        className="mapFeatureTooltip_row"
+        key="prop1"
       >
-        foobar1
-      </td>
-      <td>
-        <EuiButtonEmpty
-          aria-label="Filter on property"
-          data-test-subj="mapTooltipCreateFilterButton"
-          onClick={[Function]}
-          size="xs"
-          title="Filter on property"
+        <td
+          className="eui-textBreakWord mapFeatureTooltip__propertyLabel"
         >
-          <EuiIcon
-            type="filter"
-          />
-        </EuiButtonEmpty>
-      </td>
-    </tr>
-    <tr
-      className="mapFeatureTooltip_row"
-      key="prop2"
-    >
-      <td
-        className="eui-textBreakWord mapFeatureTooltip__propertyLabel"
-      >
-        prop2
-      </td>
-      <td
-        className="eui-textBreakWord"
-      >
-        foobar2
-      </td>
-      <td />
-    </tr>
-  </tbody>
-</table>
-`;
-
-exports[`FeatureProperties should show view actions button when there are available actions 1`] = `
-<table
-  className="eui-yScrollWithShadows mapFeatureTooltip_table"
->
-  <tbody>
-    <tr
-      className="mapFeatureTooltip_row"
-      key="prop1"
-    >
-      <td
-        className="eui-textBreakWord mapFeatureTooltip__propertyLabel"
-      >
-        prop1
-      </td>
-      <td
-        className="eui-textBreakWord"
-      >
-        foobar1
-      </td>
-      <td
-        className="mapFeatureTooltip_actionsRow"
-      >
-        <span>
+          prop1
+        </td>
+        <td
+          className="eui-textBreakWord"
+        >
+          foobar1
+        </td>
+        <td>
           <EuiButtonEmpty
             aria-label="Filter on property"
             data-test-subj="mapTooltipCreateFilterButton"
@@ -141,36 +92,97 @@ exports[`FeatureProperties should show view actions button when there are availa
               type="filter"
             />
           </EuiButtonEmpty>
-          <EuiButtonEmpty
-            aria-label="View filter actions"
-            data-test-subj="mapTooltipMoreActionsButton"
-            onClick={[Function]}
-            size="xs"
-            title="View filter actions"
-          >
-            <EuiIcon
-              type="arrowRight"
-            />
-          </EuiButtonEmpty>
-        </span>
-      </td>
-    </tr>
-    <tr
-      className="mapFeatureTooltip_row"
-      key="prop2"
-    >
-      <td
-        className="eui-textBreakWord mapFeatureTooltip__propertyLabel"
+        </td>
+      </tr>
+      <tr
+        className="mapFeatureTooltip_row"
+        key="prop2"
+      >
+        <td
+          className="eui-textBreakWord mapFeatureTooltip__propertyLabel"
+        >
+          prop2
+        </td>
+        <td
+          className="eui-textBreakWord"
+        >
+          foobar2
+        </td>
+        <td />
+      </tr>
+    </tbody>
+  </table>
+</div>
+`;
+
+exports[`FeatureProperties should show view actions button when there are available actions 1`] = `
+<div
+  className="mapFeatureTooltip_tableWrapper"
+>
+  <table
+    className="eui-yScrollWithShadows mapFeatureTooltip_table"
+  >
+    <tbody>
+      <tr
+        className="mapFeatureTooltip_row"
+        key="prop1"
       >
-        prop2
-      </td>
-      <td
-        className="eui-textBreakWord"
+        <td
+          className="eui-textBreakWord mapFeatureTooltip__propertyLabel"
+        >
+          prop1
+        </td>
+        <td
+          className="eui-textBreakWord"
+        >
+          foobar1
+        </td>
+        <td
+          className="mapFeatureTooltip_actionsRow"
+        >
+          <span>
+            <EuiButtonEmpty
+              aria-label="Filter on property"
+              data-test-subj="mapTooltipCreateFilterButton"
+              onClick={[Function]}
+              size="xs"
+              title="Filter on property"
+            >
+              <EuiIcon
+                type="filter"
+              />
+            </EuiButtonEmpty>
+            <EuiButtonEmpty
+              aria-label="View filter actions"
+              data-test-subj="mapTooltipMoreActionsButton"
+              onClick={[Function]}
+              size="xs"
+              title="View filter actions"
+            >
+              <EuiIcon
+                type="arrowRight"
+              />
+            </EuiButtonEmpty>
+          </span>
+        </td>
+      </tr>
+      <tr
+        className="mapFeatureTooltip_row"
+        key="prop2"
       >
-        foobar2
-      </td>
-      <td />
-    </tr>
-  </tbody>
-</table>
+        <td
+          className="eui-textBreakWord mapFeatureTooltip__propertyLabel"
+        >
+          prop2
+        </td>
+        <td
+          className="eui-textBreakWord"
+        >
+          foobar2
+        </td>
+        <td />
+      </tr>
+    </tbody>
+  </table>
+</div>
 `;
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/_index.scss b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/_index.scss
index 92df0ffbaad92..cc2acdf78c7de 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/_index.scss
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/_index.scss
@@ -1,12 +1,16 @@
 .mapFeatureTooltip_table {
   width: 100%;
-  max-height: calc(49vh - #{$euiSizeXL * 2});
 
   td {
     padding: $euiSizeXS;
   }
 }
 
+.mapFeatureTooltip_tableWrapper {
+  overflow: auto;
+  max-height: calc(49vh - 64px);
+}
+
 .mapFeatureTooltip_row {
   border-bottom: 1px solid $euiColorLightestShade;
 }
@@ -20,6 +24,7 @@
 }
 
 .mapFeatureTooltip__propertyLabel {
+  min-width: $euiSizeXL * 2.5;
   max-width: $euiSizeXL * 4;
   font-weight: $euiFontWeightSemiBold;
 }
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx
index ca291f585590a..71d50d06b62e4 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/features_tooltip/feature_properties.tsx
@@ -336,9 +336,11 @@ export class FeatureProperties extends Component<Props, State> {
     });
 
     return (
-      <table className="eui-yScrollWithShadows mapFeatureTooltip_table" ref={this._tableRef}>
-        <tbody>{rows}</tbody>
-      </table>
+      <div className="mapFeatureTooltip_tableWrapper">
+        <table className="eui-yScrollWithShadows mapFeatureTooltip_table" ref={this._tableRef}>
+          <tbody>{rows}</tbody>
+        </table>
+      </div>
     );
   }
 }