diff --git a/desktop/app/src/ui/components/elements-inspector/elements.tsx b/desktop/app/src/ui/components/elements-inspector/elements.tsx
index 447738b31..a37a4856f 100644
--- a/desktop/app/src/ui/components/elements-inspector/elements.tsx
+++ b/desktop/app/src/ui/components/elements-inspector/elements.tsx
@@ -12,7 +12,6 @@ import {reportInteraction} from '../../../utils/InteractionTracker';
 import ContextMenu from '../ContextMenu';
 import {PureComponent, ReactElement} from 'react';
 import FlexRow from '../FlexRow';
-import FlexColumn from '../FlexColumn';
 import Glyph from '../Glyph';
 import {colors} from '../colors';
 import Text from '../Text';
@@ -60,7 +59,6 @@ const ElementsRowContainer = styled(ContextMenu)<any>((props) => ({
   flexShrink: 0,
   flexWrap: 'nowrap',
   height: ROW_HEIGHT,
-  minWidth: '100%',
   paddingLeft: (props.level - 1) * 12,
   paddingRight: 20,
   position: 'relative',
@@ -421,7 +419,8 @@ function containsKeyInSearchResults(
   return searchResults != undefined && searchResults.matches.has(key);
 }
 
-const ElementsContainer = styled(FlexColumn)({
+const ElementsContainer = styled('div')({
+  display: 'table',
   backgroundColor: colors.white,
   minHeight: '100%',
   minWidth: '100%',
diff --git a/desktop/plugins/layout/index.tsx b/desktop/plugins/layout/index.tsx
index 0ec1f8f01..810dddefe 100644
--- a/desktop/plugins/layout/index.tsx
+++ b/desktop/plugins/layout/index.tsx
@@ -29,6 +29,7 @@ import {
   ArchivedDevice,
   ToolbarIcon,
   Layout,
+  Scrollable,
 } from 'flipper';
 import Inspector from './Inspector';
 import InspectorSidebar from './InspectorSidebar';
@@ -410,14 +411,16 @@ export default class LayoutPlugin extends FlipperPlugin<
     );
 
     const axInspector = this.state.inAXMode ? (
-      <FlexRow>
+      <FlexRow style={{height: '100%'}}>
         <VerticalRule />
-        <Inspector
-          {...inspectorProps}
-          onSelect={(selectedAXElement) => this.setState({selectedAXElement})}
-          showsSidebar={true}
-          ax
-        />
+        <Scrollable>
+          <Inspector
+            {...inspectorProps}
+            onSelect={(selectedAXElement) => this.setState({selectedAXElement})}
+            showsSidebar={true}
+            ax
+          />
+        </Scrollable>
       </FlexRow>
     ) : null;