diff --git a/ui/src/core_components/embed/CorePDF.vue b/ui/src/core_components/embed/CorePDF.vue
index 7203996f..92363efb 100644
--- a/ui/src/core_components/embed/CorePDF.vue
+++ b/ui/src/core_components/embed/CorePDF.vue
@@ -184,9 +184,6 @@ const buildMatches = () => {
 
 const renderingComplete = () => {
 	buildMatches();
-	if (fields.page.value) {
-		gotoPage(fields.page.value);
-	}
 	if (currentMatch.value) {
 		gotoHighlight(currentMatch.value);
 	}
@@ -267,6 +264,14 @@ const decrementScale = () => {
 	scale.value = scale.value > 0.25 ? scale.value - 0.1 : scale.value;
 };
 
+watch(pagesLoaded, () => {
+	if (pagesLoaded.value === pages.value) {
+		if (fields.page.value) {
+			gotoPage(fields.page.value);
+		}
+	}
+});
+
 watch([highlightsList, pagesLoaded], () => {
 	if (
 		(!highlightText.value || highlightsList.value.length === pages.value) &&