diff --git a/assets/js/graph.js b/assets/js/graph.js
index db1cfe2a5..5739acdca 100644
--- a/assets/js/graph.js
+++ b/assets/js/graph.js
@@ -9,7 +9,8 @@ async function drawGraph(
   const container = document.getElementById('graph-container')
 
   const { index, links, content } = await fetchData
-  const curPage = window.location.href.replace(baseUrl, "").replace(/\/$/g, "")
+  // Use .pathname to remove hashes / searchParams / text fragments
+  const curPage = window.location.pathname.replace(/\/$/g, "")
 
   const parseIdsFromLinks = (links) => [
     ...new Set(links.flatMap((link) => [link.source, link.target])),
diff --git a/assets/js/search.js b/assets/js/search.js
index f124d5829..26ea39adc 100644
--- a/assets/js/search.js
+++ b/assets/js/search.js
@@ -144,7 +144,7 @@ const removeMarkdown = (
     // SPA navigation
     window.navigate(
       new URL(
-        `${BASE_URL}${id}#:~:text=${encodeURIComponent(term)}/`
+        `${BASE_URL.replace(/\/$/g, "")}${id}#:~:text=${encodeURIComponent(term)}/`
       ),
       '.singlePage'
     )
diff --git a/layouts/partials/graph.html b/layouts/partials/graph.html
index 6bc77b648..b9f79763c 100644
--- a/layouts/partials/graph.html
+++ b/layouts/partials/graph.html
@@ -16,13 +16,3 @@
 </style>
 {{ $js := resources.Get "js/graph.js" | resources.Fingerprint "md5" }}
 <script src="{{ $js.Permalink }}"></script>
-<script>
-drawGraph(
-  {{strings.TrimRight "/" .Site.BaseURL}},
-  {{$.Site.Data.graphConfig.paths}},
-  {{$.Site.Data.graphConfig.depth}},
-  {{$.Site.Data.graphConfig.enableDrag}},
-  {{$.Site.Data.graphConfig.enableLegend}},
-  {{$.Site.Data.graphConfig.enableZoom}}
-);
-</script>