diff --git a/project/frontend/src/components/KennzahlenTable.tsx b/project/frontend/src/components/KennzahlenTable.tsx
index 406798e..c9729dd 100644
--- a/project/frontend/src/components/KennzahlenTable.tsx
+++ b/project/frontend/src/components/KennzahlenTable.tsx
@@ -34,6 +34,7 @@ interface KennzahlenTableProps {
 			source: string;
 		}[];
 	};
+	from?: string;
 }
 
 export default function KennzahlenTable({
@@ -41,10 +42,11 @@ export default function KennzahlenTable({
 	data,
 	pdfId,
 	settings,
+	from
 }: KennzahlenTableProps) {
 	const [editingIndex, setEditingIndex] = useState<string>("");
 	const [editValue, setEditValue] = useState("");
-	const navigate = useNavigate({ from: "/extractedResult/$pitchBook" });
+	const navigate = useNavigate();
 
 	const queryClient = useQueryClient();
 
@@ -120,6 +122,7 @@ export default function KennzahlenTable({
 				pitchBook: pdfId,
 				kpi: settingName,
 			},
+			search: { from: from ?? undefined },
 		});
 	};
 
diff --git a/project/frontend/src/routes/extractedResult.$pitchBook.tsx b/project/frontend/src/routes/extractedResult.$pitchBook.tsx
index 68acdb4..59a8039 100644
--- a/project/frontend/src/routes/extractedResult.$pitchBook.tsx
+++ b/project/frontend/src/routes/extractedResult.$pitchBook.tsx
@@ -98,6 +98,7 @@ function ExtractedResultsPage() {
 						onPageClick={setCurrentPage}
 						data={kpi}
 						pdfId={pitchBook}
+						from={from}
 					/>
 				</Paper>
 				<Box
diff --git a/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx b/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx
index 21dc929..f809ce9 100644
--- a/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx
+++ b/project/frontend/src/routes/extractedResult_.$pitchBook.$kpi.tsx
@@ -27,6 +27,11 @@ import { redirect } from "@tanstack/react-router";
 
 export const Route = createFileRoute("/extractedResult_/$pitchBook/$kpi")({
 	component: ExtractedResultsPage,
+	validateSearch: (search: Record<string, unknown>) => {
+		return {
+			from: typeof search.from === "string" ? search.from : undefined,
+		};
+	},
 	loader: async ({ context: { queryClient }, params: { pitchBook } }) => {
 		try {
 			return await queryClient.ensureQueryData(kpiQueryOptions(pitchBook));
@@ -43,6 +48,7 @@ function ExtractedResultsPage() {
 	const { pitchBook, kpi } = params;
 	const navigate = useNavigate();
 	const queryClient = useQueryClient();
+	const { from } = Route.useSearch();
 
 	const {
 		data: kpiData
@@ -76,7 +82,8 @@ function ExtractedResultsPage() {
 			});
 			navigate({
 				to: "/extractedResult/$pitchBook",
-				params: { pitchBook }
+				params: { pitchBook },
+				search: from ? { from } : undefined
 			});
 		},
 		onError: (error) => {
@@ -112,7 +119,8 @@ function ExtractedResultsPage() {
 		} else {
 			navigate({
 				to: "/extractedResult/$pitchBook",
-				params: { pitchBook }
+				params: { pitchBook },
+				search: from ? { from } : undefined
 			});
 		}
 	};
@@ -121,7 +129,8 @@ function ExtractedResultsPage() {
 		setShowConfirmDialog(false);
 		navigate({
 			to: "/extractedResult/$pitchBook",
-			params: { pitchBook }
+			params: { pitchBook },
+			search: from ? { from } : undefined
 		});
 	};