diff --git a/apps/app/src/paths/AssignmentResponseStudent.tsx b/apps/app/src/paths/AssignmentResponseStudent.tsx
index 6bbb17b58..d573df3ef 100644
--- a/apps/app/src/paths/AssignmentResponseStudent.tsx
+++ b/apps/app/src/paths/AssignmentResponseStudent.tsx
@@ -233,7 +233,7 @@ export function AssignmentResponseStudent() {
       const targetAbsoluteTop = iframeTop + offset;
 
       scrollingContainer.current.scrollTo({
-        top: targetAbsoluteTop - 0,
+        top: targetAbsoluteTop - 90,
         behavior: "smooth",
       });
     }
@@ -259,6 +259,7 @@ export function AssignmentResponseStudent() {
         doenetML={data.doenetML}
         doenetmlVersion={data.doenetmlVersion}
         requestScrollTo={requestScrollTo}
+        viewerContainerRef={viewerContainer}
       />
     );
   } else {
@@ -348,9 +349,7 @@ export function AssignmentResponseStudent() {
             </GridItem>
           </Grid>
         </GridItem>
-        <GridItem area="centerContent" ref={viewerContainer}>
-          {mainPanel}
-        </GridItem>
+        <GridItem area="centerContent">{mainPanel}</GridItem>
       </Grid>
     </>
   );
diff --git a/apps/app/src/paths/editor/DocEditorViewMode.tsx b/apps/app/src/paths/editor/DocEditorViewMode.tsx
index 26a8554a8..264913f21 100644
--- a/apps/app/src/paths/editor/DocEditorViewMode.tsx
+++ b/apps/app/src/paths/editor/DocEditorViewMode.tsx
@@ -43,7 +43,7 @@ export function DocEditorViewMode() {
       const targetAbsoluteTop = iframeTop + offset;
 
       scrollingContainer.current.scrollTo({
-        top: targetAbsoluteTop - 90,
+        top: targetAbsoluteTop - (parseInt(headerHeight) + 10),
         behavior: "smooth",
       });
     }
diff --git a/apps/app/src/views/AssignmentItemResponseStudent.tsx b/apps/app/src/views/AssignmentItemResponseStudent.tsx
index 967bb4304..29dc03b61 100644
--- a/apps/app/src/views/AssignmentItemResponseStudent.tsx
+++ b/apps/app/src/views/AssignmentItemResponseStudent.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { RefObject, useEffect, useState } from "react";
 import { DoenetViewer } from "@doenet/doenetml-iframe";
 
 import {
@@ -39,6 +39,7 @@ export function AssignmentItemResponseStudent({
   doenetML,
   doenetmlVersion,
   requestScrollTo,
+  viewerContainerRef,
 }: {
   assignment: {
     name: string;
@@ -70,6 +71,7 @@ export function AssignmentItemResponseStudent({
   doenetML: string;
   doenetmlVersion: DoenetmlVersion;
   requestScrollTo: (_offset: number) => void;
+  viewerContainerRef?: RefObject<HTMLDivElement | null>;
 }) {
   useEffect(() => {
     document.title = `${assignment?.name} - Doenet`;
@@ -372,6 +374,7 @@ export function AssignmentItemResponseStudent({
             overflow="hidden"
           >
             <Box
+              ref={viewerContainerRef}
               minHeight="calc(100vh - 80px)"
               background="var(--canvas)"
               borderWidth="1px"