diff --git a/Oqtane.Server/Components/App.razor b/Oqtane.Server/Components/App.razor
index 8acd74b0..30230e75 100644
--- a/Oqtane.Server/Components/App.razor
+++ b/Oqtane.Server/Components/App.razor
@@ -187,7 +187,7 @@
                     }
                     @if (_renderMode == RenderModes.Static)
                     {
-                        _scrollPositionScript = "<page-script src=\"/js/scrollposition.js\"></page-script>";                        
+                        _scrollPositionScript = CreateScrollPositionScript();
                     }
 
                     _headResources += ParseScripts(site.HeadContent);
@@ -488,6 +488,24 @@
         "</script>";
     }
 
+    private string CreateScrollPositionScript()
+    {
+        return
+        "<script>" + Environment.NewLine +
+        "   window.interceptNavigation = () => {" + Environment.NewLine +
+        "       let currentUrl = window.location.href;" + Environment.NewLine +
+        "       Blazor.addEventListener('enhancedload', () => {" + Environment.NewLine +
+        "           let newUrl = window.location.href;" + Environment.NewLine +
+        "           if (currentUrl != newUrl) {" + Environment.NewLine +
+        "               window.scrollTo({ top: 0, left: 0, behavior: 'instant' });" + Environment.NewLine +
+        "           }" + Environment.NewLine +
+        "           currentUrl = newUrl;" + Environment.NewLine +
+        "       });" + Environment.NewLine +
+        "   };" + Environment.NewLine +
+        "   document.onload += window.interceptNavigation();" + Environment.NewLine +
+        "</script>";
+    }
+
     private string ParseScripts(string content)
     {
         // iterate scripts
diff --git a/Oqtane.Server/wwwroot/js/scrollposition.js b/Oqtane.Server/wwwroot/js/scrollposition.js
deleted file mode 100644
index 58150ac6..00000000
--- a/Oqtane.Server/wwwroot/js/scrollposition.js
+++ /dev/null
@@ -1,12 +0,0 @@
-
-function setScrollPosition() {
-    window.scrollTo({
-        top: 0,
-        left: 0,
-        behavior: 'instant'
-    });
-}
-
-export function onUpdate() {
-    setScrollPosition();
-}
\ No newline at end of file