diff --git a/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking.tsx b/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking.tsx
index d392e43b2..7b3b2094c 100644
--- a/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking.tsx
+++ b/extensions/measurement-tracking/src/panels/PanelMeasurementTableTracking.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { utils } from '@ohif/core';
-import { AccordionTrigger, MeasurementTable, useViewportGrid } from '@ohif/ui-next';
+import { AccordionTrigger, MeasurementTable, ScrollArea, useViewportGrid } from '@ohif/ui-next';
 import {
   PanelMeasurement,
   StudyMeasurements,
@@ -83,29 +83,31 @@ function PanelMeasurementTableTracking(props) {
   );
 
   return (
-    <div data-cy="trackedMeasurements-panel">
-      <PanelMeasurement
-        measurementFilter={measurementFilter}
-        emptyComponent={EmptyComponent}
-        sourceChildren={props.children}
-      >
-        <StudyMeasurements grouping={props.grouping}>
-          <AccordionGroup.Trigger
-            key="trackingMeasurementsHeader"
-            asChild={true}
-          >
-            <Header key="trackingHeadChild" />
-          </AccordionGroup.Trigger>
-          <MeasurementsOrAdditionalFindings
-            key="measurementsOrAdditionalFindings"
-            activeStudyUID={trackedStudy}
-            customHeader={StudyMeasurementsActions}
-            measurementFilter={measurementFilter}
-            actions={actions}
-          />
-        </StudyMeasurements>
-      </PanelMeasurement>
-    </div>
+    <ScrollArea>
+      <div data-cy="trackedMeasurements-panel">
+        <PanelMeasurement
+          measurementFilter={measurementFilter}
+          emptyComponent={EmptyComponent}
+          sourceChildren={props.children}
+        >
+          <StudyMeasurements grouping={props.grouping}>
+            <AccordionGroup.Trigger
+              key="trackingMeasurementsHeader"
+              asChild={true}
+            >
+              <Header key="trackingHeadChild" />
+            </AccordionGroup.Trigger>
+            <MeasurementsOrAdditionalFindings
+              key="measurementsOrAdditionalFindings"
+              activeStudyUID={trackedStudy}
+              customHeader={StudyMeasurementsActions}
+              measurementFilter={measurementFilter}
+              actions={actions}
+            />
+          </StudyMeasurements>
+        </PanelMeasurement>
+      </div>
+    </ScrollArea>
   );
 }
 
diff --git a/platform/ui-next/src/components/ScrollArea/ScrollArea.tsx b/platform/ui-next/src/components/ScrollArea/ScrollArea.tsx
index f8df1b8af..35f73701d 100644
--- a/platform/ui-next/src/components/ScrollArea/ScrollArea.tsx
+++ b/platform/ui-next/src/components/ScrollArea/ScrollArea.tsx
@@ -57,7 +57,7 @@ const ScrollArea = React.forwardRef<
     <ScrollAreaPrimitive.Root
       ref={ref}
       className={cn('relative h-full overflow-hidden', className)}
-      type={props.type || 'auto'}
+      type={props.type}
       {...props}
     >
       <ScrollAreaPrimitive.Viewport