diff --git a/desktop/flipper-ui-core/src/chrome/plugin-manager/__tests__/__snapshots__/PluginInstaller.node.tsx.snap b/desktop/flipper-ui-core/src/chrome/plugin-manager/__tests__/__snapshots__/PluginInstaller.node.tsx.snap
index 601aff55a..890169d2f 100644
--- a/desktop/flipper-ui-core/src/chrome/plugin-manager/__tests__/__snapshots__/PluginInstaller.node.tsx.snap
+++ b/desktop/flipper-ui-core/src/chrome/plugin-manager/__tests__/__snapshots__/PluginInstaller.node.tsx.snap
@@ -53,7 +53,7 @@ exports[`load PluginInstaller list 1`] = `
       </span>
     </div>
     <div
-      class="css-o1pvkz-View-FlexBox-FlexColumn-Container emab7y20"
+      class="css-bgfc37-View-FlexBox-FlexColumn-Container emab7y20"
       tabindex="0"
     >
       <div
@@ -130,7 +130,6 @@ exports[`load PluginInstaller list 1`] = `
       </div>
       <div
         class="css-p5h61d-View-FlexBox-FlexColumn-Container emab7y20"
-        style="overflow: visible;"
       >
         <div
           class="ant-dropdown-trigger css-18abd42-View-FlexBox-FlexColumn e1e47qlf0"
@@ -440,7 +439,7 @@ exports[`load PluginInstaller list with one plugin installed 1`] = `
       </span>
     </div>
     <div
-      class="css-o1pvkz-View-FlexBox-FlexColumn-Container emab7y20"
+      class="css-bgfc37-View-FlexBox-FlexColumn-Container emab7y20"
       tabindex="0"
     >
       <div
@@ -517,7 +516,6 @@ exports[`load PluginInstaller list with one plugin installed 1`] = `
       </div>
       <div
         class="css-p5h61d-View-FlexBox-FlexColumn-Container emab7y20"
-        style="overflow: visible;"
       >
         <div
           class="ant-dropdown-trigger css-18abd42-View-FlexBox-FlexColumn e1e47qlf0"
diff --git a/desktop/flipper-ui-core/src/ui/components/table/ManagedTable.tsx b/desktop/flipper-ui-core/src/ui/components/table/ManagedTable.tsx
index 73d9078fc..f9c3919af 100644
--- a/desktop/flipper-ui-core/src/ui/components/table/ManagedTable.tsx
+++ b/desktop/flipper-ui-core/src/ui/components/table/ManagedTable.tsx
@@ -155,7 +155,7 @@ type ManagedTableState = {
 };
 
 const Container = styled(FlexColumn)<{canOverflow?: boolean}>((props) => ({
-  overflow: props.canOverflow ? 'auto' : 'visible',
+  overflow: props.canOverflow ? 'scroll' : 'visible',
   flexGrow: 1,
   height: '100%',
 }));
@@ -715,8 +715,7 @@ export class ManagedTable extends React.Component<
             horizontallyScrollable={horizontallyScrollable}
           />
         )}
-        <Container
-          style={{overflow: this.props.autoHeight ? 'visible' : 'hidden'}}>
+        <Container>
           {this.props.autoHeight ? (
             <ContextMenu
               buildItems={
diff --git a/desktop/flipper-ui-core/src/ui/components/table/TableHead.tsx b/desktop/flipper-ui-core/src/ui/components/table/TableHead.tsx
index 5ef4370d5..eeeb6562b 100644
--- a/desktop/flipper-ui-core/src/ui/components/table/TableHead.tsx
+++ b/desktop/flipper-ui-core/src/ui/components/table/TableHead.tsx
@@ -111,7 +111,7 @@ class TableHeadColumn extends PureComponent<{
   componentDidMount() {
     if (this.props.horizontallyScrollable && this.ref) {
       // measure initial width
-      this.onResize(this.ref.offsetWidth);
+      this.onResize(this.ref.getBoundingClientRect().width);
     }
   }
 
@@ -146,14 +146,16 @@ class TableHeadColumn extends PureComponent<{
         throw new Error('expected there to be parentElement');
       }
 
-      const parentWidth = parentElement.clientWidth;
+      const parentMeasures = parentElement.getBoundingClientRect();
+      const parentWidth = parentMeasures.width;
       const {childNodes} = parentElement;
 
       const lastElem = childNodes[childNodes.length - 1];
-      const right =
-        lastElem instanceof HTMLElement
-          ? lastElem.offsetLeft + lastElem.clientWidth + 1
-          : 0;
+      let right = 0;
+      if (lastElem instanceof HTMLElement) {
+        const lastElemMeasures = lastElem.getBoundingClientRect();
+        right = lastElemMeasures.left + lastElemMeasures.width;
+      }
 
       if (right < parentWidth) {
         normalizedWidth = calculatePercentage(parentWidth, newWidth);