diff --git a/ui/src/ifql/components/TimeMachineTable.tsx b/ui/src/ifql/components/TimeMachineTable.tsx
index f1ae32280..cde6f0d19 100644
--- a/ui/src/ifql/components/TimeMachineTable.tsx
+++ b/ui/src/ifql/components/TimeMachineTable.tsx
@@ -1,4 +1,4 @@
-import React, {PureComponent} from 'react'
+import React, {PureComponent, CSSProperties} from 'react'
 import _ from 'lodash'
 import {Grid, GridCellProps, AutoSizer, ColumnSizer} from 'react-virtualized'
 
@@ -6,13 +6,55 @@ import {ErrorHandling} from 'src/shared/decorators/errors'
 import {ScriptResult} from 'src/types'
 import {vis} from 'src/ifql/constants'
 
+const NUM_FIXED_ROWS = 1
+
+interface State {
+  scrollLeft: number
+}
+
 @ErrorHandling
-export default class TimeMachineTable extends PureComponent<ScriptResult> {
+export default class TimeMachineTable extends PureComponent<
+  ScriptResult,
+  State
+> {
+  constructor(props) {
+    super(props)
+    this.state = {
+      scrollLeft: 0,
+    }
+  }
+
   public render() {
     const {data} = this.props
+    const {scrollLeft} = this.state
 
     return (
       <div style={{flex: '1 1 auto'}}>
+        <AutoSizer>
+          {({width}) => (
+            <ColumnSizer
+              width={width}
+              columnCount={this.columnCount}
+              columnMinWidth={vis.TIME_COLUMN_WIDTH}
+            >
+              {({adjustedWidth, getColumnWidth}) => (
+                <Grid
+                  className="table-graph--scroll-window"
+                  rowCount={1}
+                  fixedRowCount={1}
+                  width={adjustedWidth}
+                  scrollLeft={scrollLeft}
+                  style={this.headerStyle}
+                  columnWidth={getColumnWidth}
+                  height={vis.TABLE_ROW_HEIGHT}
+                  columnCount={this.columnCount}
+                  rowHeight={vis.TABLE_ROW_HEIGHT}
+                  cellRenderer={this.headerCellRenderer}
+                />
+              )}
+            </ColumnSizer>
+          )}
+        </AutoSizer>
         <AutoSizer>
           {({height, width}) => (
             <ColumnSizer
@@ -23,13 +65,15 @@ export default class TimeMachineTable extends PureComponent<ScriptResult> {
               {({adjustedWidth, getColumnWidth}) => (
                 <Grid
                   className="table-graph--scroll-window"
-                  cellRenderer={this.cellRenderer}
-                  columnCount={this.columnCount}
-                  columnWidth={getColumnWidth}
-                  height={height}
-                  rowCount={data.length}
-                  rowHeight={vis.TABLE_ROW_HEIGHT}
                   width={adjustedWidth}
+                  style={this.tableStyle}
+                  onScroll={this.handleScroll}
+                  columnWidth={getColumnWidth}
+                  columnCount={this.columnCount}
+                  cellRenderer={this.cellRenderer}
+                  rowHeight={vis.TABLE_ROW_HEIGHT}
+                  height={height - this.headerOffset}
+                  rowCount={data.length - NUM_FIXED_ROWS}
                 />
               )}
             </ColumnSizer>
@@ -39,10 +83,45 @@ export default class TimeMachineTable extends PureComponent<ScriptResult> {
     )
   }
 
+  private get headerStyle(): CSSProperties {
+    // cannot use overflow: hidden overflow-x / overflow-y gets overridden by react-virtualized
+    return {overflowX: 'hidden', overflowY: 'hidden'}
+  }
+
+  private get tableStyle(): CSSProperties {
+    return {marginTop: `${this.headerOffset}px`}
+  }
+
   private get columnCount(): number {
     return _.get(this.props.data, '0', []).length
   }
 
+  private get headerOffset(): number {
+    return NUM_FIXED_ROWS * vis.TABLE_ROW_HEIGHT
+  }
+
+  private handleScroll = ({scrollLeft}): void => {
+    this.setState({scrollLeft})
+  }
+
+  private headerCellRenderer = ({
+    columnIndex,
+    key,
+    style,
+  }: GridCellProps): React.ReactNode => {
+    const {data} = this.props
+
+    return (
+      <div
+        key={key}
+        style={style}
+        className="table-graph-cell table-graph-cell__fixed-row"
+      >
+        {data[0][columnIndex]}
+      </div>
+    )
+  }
+
   private cellRenderer = ({
     columnIndex,
     key,
@@ -50,15 +129,10 @@ export default class TimeMachineTable extends PureComponent<ScriptResult> {
     style,
   }: GridCellProps): React.ReactNode => {
     const {data} = this.props
-    const headerRowClass = !rowIndex ? 'table-graph-cell__fixed-row' : ''
 
     return (
-      <div
-        key={key}
-        style={style}
-        className={`table-graph-cell ${headerRowClass}`}
-      >
-        {data[rowIndex][columnIndex]}
+      <div key={key} style={style} className="table-graph-cell">
+        {data[rowIndex + NUM_FIXED_ROWS][columnIndex]}
       </div>
     )
   }
diff --git a/ui/src/ifql/components/TimeMachineVis.tsx b/ui/src/ifql/components/TimeMachineVis.tsx
index 594afeb69..5f58e9a29 100644
--- a/ui/src/ifql/components/TimeMachineVis.tsx
+++ b/ui/src/ifql/components/TimeMachineVis.tsx
@@ -24,7 +24,7 @@ class TimeMachineVis extends PureComponent<Props, State> {
     this.state = {selectedResultID: this.initialResultID}
   }
 
-  public componentDidUpdate(__, prevState) {
+  public componentDidUpdate() {
     if (!this.selectedResult) {
       this.setState({selectedResultID: this.initialResultID})
     }