diff --git a/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/components/edit/AssignmentEdit.spec.tsx b/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/components/edit/AssignmentEdit.spec.tsx
index ccbe012ff..833aee90b 100644
--- a/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/components/edit/AssignmentEdit.spec.tsx
+++ b/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/components/edit/AssignmentEdit.spec.tsx
@@ -99,7 +99,7 @@ describe("AssignmentEdit", () => {
it("renders the assignment name and the section papers for a Regular assignment", () => {
renderWithMantine(
Control when this assignment becomes visible to students. You can make it visible
immediately, schedule it for a future date, or set it to hide automatically.
diff --git a/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/Grader/components/GraderPageSection.tsx b/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/Grader/components/GraderPageSection.tsx
index 8da9e4749..212c93a12 100644
--- a/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/Grader/components/GraderPageSection.tsx
+++ b/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/Grader/components/GraderPageSection.tsx
@@ -1,4 +1,6 @@
-import React, { PropsWithChildren, useEffect, useRef } from "react";
+import React, { PropsWithChildren } from "react";
+
+import { useRouteHeadingFocus } from "@/hooks/useRouteHeadingFocus";
import styles from "../Grader.module.css";
@@ -12,12 +14,8 @@ export const GraderPageSection: React.FC
+ {location.pathname}
+
+ Next page
+
+ >
+ );
+};
+
+describe("useRouteHeadingFocus", () => {
+ it("focuses the heading on initial render and after navigation", async () => {
+ const user = userEvent.setup();
+
+ render(
+