diff --git a/x-pack/plugins/uptime/public/components/common/header/page_header.tsx b/x-pack/plugins/uptime/public/components/common/header/page_header.tsx
index 7d093efd31be0..923aee472faa6 100644
--- a/x-pack/plugins/uptime/public/components/common/header/page_header.tsx
+++ b/x-pack/plugins/uptime/public/components/common/header/page_header.tsx
@@ -44,7 +44,7 @@ export const PageHeader = () => {
   const DatePickerComponent = () =>
     isCertRoute ? (
       <CertRefreshBtn />
-    ) : isStepDetailRoute ? null : (
+    ) : (
       <StyledPicker grow={false} style={{ flexBasis: 485 }}>
         <UptimeDatePicker />
       </StyledPicker>
@@ -52,6 +52,10 @@ export const PageHeader = () => {
 
   const isMonRoute = useRouteMatch(MONITOR_ROUTE);
 
+  if (isStepDetailRoute) {
+    return null;
+  }
+
   return (
     <>
       <SyntheticsCallout />
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts
index 320e415585ca3..8b06547437fa5 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts
@@ -13,7 +13,7 @@ interface WaterfallChartOuterContainerProps {
 }
 
 export const WaterfallChartOuterContainer = euiStyled.div<WaterfallChartOuterContainerProps>`
-  height: ${(props) => (props.height ? `${props.height}px` : 'auto')};
+  height: calc(100vh - 228px);
   overflow-y: ${(props) => (props.height ? 'scroll' : 'visible')};
   overflow-x: hidden;
 `;
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_chart.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_chart.tsx
index d92e26335a6bd..614f045846b2d 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_chart.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_chart.tsx
@@ -86,7 +86,6 @@ export const WaterfallChart = ({
   barStyleAccessor,
   renderSidebarItem,
   renderLegendItem,
-  maxHeight = 800,
 }: WaterfallChartProps) => {
   const { data, sidebarItems, legendItems } = useWaterfallContext();
 
@@ -106,7 +105,7 @@ export const WaterfallChart = ({
     legendItems && legendItems.length > 0 && renderLegendItem ? true : false;
 
   return (
-    <WaterfallChartOuterContainer height={maxHeight}>
+    <WaterfallChartOuterContainer>
       <>
         <WaterfallChartFixedTopContainer>
           <EuiFlexGroup gutterSize="none" responsive={false}>