diff --git a/frontend/src/components/Diff/Diff.tsx b/frontend/src/components/Diff/Diff.tsx
index d13f62203..b2c54bbcb 100644
--- a/frontend/src/components/Diff/Diff.tsx
+++ b/frontend/src/components/Diff/Diff.tsx
@@ -3,9 +3,11 @@
 import {
     createContext,
     type CSSProperties,
+    type Dispatch,
     forwardRef,
     type HTMLAttributes,
     type RefObject,
+    type SetStateAction,
     useRef,
     useState,
 } from "react";
@@ -25,6 +27,8 @@ import styles from "./Diff.module.scss";
 import * as AsmDiffer from "./DiffRowAsmDiffer";
 import DragBar from "./DragBar";
 import { useHighlighers } from "./Highlighter";
+import { activateTabInLayout, type Layout } from "../CustomLayout";
+import { TabId } from "../Scratch/Scratch";
 
 const copyDiffContentsToClipboard = (diff: api.DiffOutput, kind: string) => {
     // kind is either "base", "current", or "previous"
@@ -154,21 +158,48 @@ function ThreeWayToggleButton({
 }
 
 export function scrollToLineNumber(
-    editorView: RefObject<EditorView>,
+    sourceEditorView: RefObject<EditorView>,
+    contextEditorView: RefObject<EditorView>,
+    setLayout: Dispatch<SetStateAction<Layout>>,
+    isInContext: boolean,
     lineNumber: number,
 ) {
+    const editorView = isInContext ? contextEditorView : sourceEditorView;
     if (!editorView) {
         return;
     }
-    if (lineNumber <= editorView.current.state.doc.lines) {
-        // check if the source line <= number of lines
-        // which can be false if pragmas are used to force line numbers
-        const line = editorView.current.state.doc.line(lineNumber);
-        if (line) {
-            const { top } = editorView.current.lineBlockAt(line.to);
-            editorView.current.scrollDOM.scrollTo({ top, behavior: "smooth" });
-        }
+    // check if the source line <= number of lines
+    // which can be false if pragmas are used to force line numbers
+    if (lineNumber > editorView.current.state.doc.lines) {
+        return;
     }
+    const line = editorView.current.state.doc.line(lineNumber);
+    if (!line) {
+        return;
+    }
+    setLayout((layout) => {
+        const clone = { ...layout };
+        activateTabInLayout(
+            clone,
+            isInContext ? TabId.CONTEXT : TabId.SOURCE_CODE,
+        );
+
+        const scrollToLine = () => {
+            if (editorView.current.inView) {
+                const { top } = editorView.current.lineBlockAt(line.to);
+                editorView.current.scrollDOM.scrollTo({
+                    top,
+                    behavior: "smooth",
+                });
+            } else {
+                requestAnimationFrame(scrollToLine);
+            }
+        };
+
+        requestAnimationFrame(scrollToLine);
+
+        return clone;
+    });
 }
 
 export const PADDING_TOP = 8;
diff --git a/frontend/src/components/Diff/DiffRowAsmDiffer.tsx b/frontend/src/components/Diff/DiffRowAsmDiffer.tsx
index 5bbbba315..a11788230 100644
--- a/frontend/src/components/Diff/DiffRowAsmDiffer.tsx
+++ b/frontend/src/components/Diff/DiffRowAsmDiffer.tsx
@@ -1,6 +1,13 @@
 /* eslint css-modules/no-unused-class: off */
 
-import { type CSSProperties, type RefObject, memo, useContext } from "react";
+import {
+    type CSSProperties,
+    type Dispatch,
+    type RefObject,
+    type SetStateAction,
+    memo,
+    useContext,
+} from "react";
 
 import clsx from "clsx";
 import type { EditorView } from "codemirror";
@@ -19,6 +26,7 @@ import {
 } from "./Diff";
 import styles from "./Diff.module.scss";
 import type { Highlighter } from "./Highlighter";
+import type { Layout } from "../CustomLayout";
 
 // Regex for tokenizing lines for click-to-highlight purposes.
 // Strings matched by the first regex group (spaces, punctuation)
@@ -82,8 +90,13 @@ function DiffCell({
     highlighter: Highlighter;
 }) {
     const selectedSourceLine = useContext(SelectedSourceLineContext);
-    const sourceEditor = useContext<RefObject<EditorView>>(ScrollContext);
+    const { sourceEditor, contextEditor, setLayout } = useContext<{
+        sourceEditor: RefObject<EditorView>;
+        contextEditor: RefObject<EditorView>;
+        setLayout: Dispatch<SetStateAction<Layout>>;
+    }>(ScrollContext);
     const hasLineNo = typeof cell?.src_line !== "undefined";
+    const isInContext = cell?.src?.some((s) => s?.includes("ctx"));
 
     if (!cell) return <div className={clsx(styles.cell, className)} />;
 
@@ -112,7 +125,13 @@ function DiffCell({
                 <span className={styles.lineNumber}>
                     <button
                         onClick={() =>
-                            scrollToLineNumber(sourceEditor, cell.src_line)
+                            scrollToLineNumber(
+                                sourceEditor,
+                                contextEditor,
+                                setLayout,
+                                isInContext,
+                                cell.src_line,
+                            )
                         }
                     >
                         {cell.src_line}
diff --git a/frontend/src/components/Scratch/Scratch.tsx b/frontend/src/components/Scratch/Scratch.tsx
index 93b1c7f62..6557a740e 100644
--- a/frontend/src/components/Scratch/Scratch.tsx
+++ b/frontend/src/components/Scratch/Scratch.tsx
@@ -42,7 +42,7 @@ import { pascal } from "@/lib/codemirror/pascal";
 import ObjdiffPanel from "../Diff/ObjdiffPanel";
 import ScrollRestorer from "../ScrollRestorer";
 
-enum TabId {
+export enum TabId {
     ABOUT = "scratch_about",
     SOURCE_CODE = "scratch_source_code",
     CONTEXT = "scratch_context",
@@ -477,7 +477,9 @@ export default function Scratch({
             </ErrorBoundary>
             <ErrorBoundary>
                 {layout && (
-                    <ScrollContext.Provider value={sourceEditor}>
+                    <ScrollContext.Provider
+                        value={{ sourceEditor, contextEditor, setLayout }}
+                    >
                         <CustomLayout
                             layout={layout}
                             onChange={setLayout}
diff --git a/frontend/src/lib/api/types.ts b/frontend/src/lib/api/types.ts
index 67ecb72f8..51803420f 100644
--- a/frontend/src/lib/api/types.ts
+++ b/frontend/src/lib/api/types.ts
@@ -88,7 +88,7 @@ export type DiffCell = {
     text: DiffText[];
     line?: number;
     branch?: number;
-    src?: string;
+    src?: string[];
     src_comment?: string;
     src_line?: number;
     src_path?: string;