diff --git a/extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/TrackedMeasurementsContext.jsx b/extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/TrackedMeasurementsContext.jsx
index 93ec8e7bb..8f0bbc915 100644
--- a/extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/TrackedMeasurementsContext.jsx
+++ b/extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/TrackedMeasurementsContext.jsx
@@ -20,7 +20,8 @@ function TrackedMeasurementsContextProvider(
   { children }
 ) {
   function promptUser(message, ctx, evt) {
-    const { StudyInstanceUID, SeriesInstanceUID } = evt;
+    console.log('promput user:', evt);
+    const { viewportIndex, StudyInstanceUID, SeriesInstanceUID } = evt;
     // TODO: ... ActiveViewport? Or Study + Series --> Viewport?
     // Let's just use zero for meow?
     return new Promise(function(resolve, reject) {
@@ -31,7 +32,7 @@ function TrackedMeasurementsContextProvider(
       };
 
       UIViewportDialogService.show({
-        viewportIndex: 0,
+        viewportIndex,
         type: 'info',
         message,
         actions: [
diff --git a/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx b/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx
index ca6bd603a..4ffa0aab1 100644
--- a/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx
+++ b/extensions/measurement-tracking/src/panels/PanelStudyBrowserTracking/PanelStudyBrowserTracking.jsx
@@ -19,12 +19,14 @@ function PanelStudyBrowserTracking({
   // doesn't have to have such an intense shape. This works well enough for now.
   // Tabs --> Studies --> DisplaySets --> Thumbnails
   const [{ StudyInstanceUIDs }, dispatchImageViewer] = useImageViewer();
-  const [{ viewports }, dispatchViewportGrid] = useViewportGrid();
+  const [
+    { activeViewportIndex, viewports },
+    dispatchViewportGrid,
+  ] = useViewportGrid();
   const [
     trackedMeasurements,
     sendTrackedMeasurementsEvent,
   ] = useTrackedMeasurements();
-  console.warn('trackedMeasurementsState: ', trackedMeasurements);
   const [activeTabName, setActiveTabName] = useState('primary');
   const [expandedStudyInstanceUIDs, setExpandedStudyInstanceUIDs] = useState(
     []
@@ -44,6 +46,7 @@ function PanelStudyBrowserTracking({
         } = measurement;
 
         sendTrackedMeasurementsEvent('TRACK_SERIES', {
+          viewportIndex: activeViewportIndex,
           StudyInstanceUID,
           SeriesInstanceUID,
         });
@@ -54,7 +57,7 @@ function PanelStudyBrowserTracking({
     );
 
     return unsubscribe;
-  }, [MeasurementService, sendTrackedMeasurementsEvent]);
+  }, [MeasurementService, activeViewportIndex, sendTrackedMeasurementsEvent]);
 
   const { trackedStudy, trackedSeries } = trackedMeasurements.context;
 
@@ -188,8 +191,11 @@ function PanelStudyBrowserTracking({
       StudyInstanceUID
     );
     const updatedExpandedStudyInstanceUIDs = shouldCollapseStudy
-      // eslint-disable-next-line prettier/prettier
-      ? [...expandedStudyInstanceUIDs.filter(stdyUid => stdyUid !== StudyInstanceUID)]
+      ? [
+          ...expandedStudyInstanceUIDs.filter(
+            stdyUid => stdyUid !== StudyInstanceUID
+          ),
+        ]
       : [...expandedStudyInstanceUIDs, StudyInstanceUID];
 
     setExpandedStudyInstanceUIDs(updatedExpandedStudyInstanceUIDs);