diff --git a/spiffworkflow-frontend/src/App.tsx b/spiffworkflow-frontend/src/App.tsx
index b7eaca80..17afca14 100644
--- a/spiffworkflow-frontend/src/App.tsx
+++ b/spiffworkflow-frontend/src/App.tsx
@@ -15,6 +15,8 @@ import { AbilityContext } from './contexts/Can';
 import UserService from './services/UserService';
 import ErrorDisplay from './components/ErrorDisplay';
 import APIErrorProvider from './contexts/APIErrorContext';
+import ScrollToTop from "./components/ScrollToTop";
+import React from "react";
 
 export default function App() {
   if (!UserService.isLoggedIn()) {
@@ -32,6 +34,7 @@ export default function App() {
           <BrowserRouter>
             <NavigationBar />
             <Content>
+              <ScrollToTop />
               <ErrorDisplay />
               <ErrorBoundary>
                 <Routes>
diff --git a/spiffworkflow-frontend/src/components/ErrorDisplay.tsx b/spiffworkflow-frontend/src/components/ErrorDisplay.tsx
index 40116973..67e6e18d 100644
--- a/spiffworkflow-frontend/src/components/ErrorDisplay.tsx
+++ b/spiffworkflow-frontend/src/components/ErrorDisplay.tsx
@@ -109,7 +109,6 @@ export default function ErrorDisplay() {
 
   if (errorObject) {
     const title = 'Error:';
-    window.scrollTo(0, 0); // Scroll back to the top of the page
 
     errorTag = (
       <Notification title={title} onClose={() => removeError()} type="error">
diff --git a/spiffworkflow-frontend/src/components/ScrollToTop.tsx b/spiffworkflow-frontend/src/components/ScrollToTop.tsx
new file mode 100644
index 00000000..01d0b580
--- /dev/null
+++ b/spiffworkflow-frontend/src/components/ScrollToTop.tsx
@@ -0,0 +1,12 @@
+import { useEffect } from "react";
+import { useLocation } from "react-router-dom";
+
+export default function ScrollToTop() {
+    const { pathname } = useLocation();
+
+    useEffect(() => {
+        window.scrollTo(0, 0);
+    }, [pathname]);
+
+    return null;
+}
\ No newline at end of file
diff --git a/spiffworkflow-frontend/src/routes/TaskShow.tsx b/spiffworkflow-frontend/src/routes/TaskShow.tsx
index 5a422e5f..6f1407d5 100644
--- a/spiffworkflow-frontend/src/routes/TaskShow.tsx
+++ b/spiffworkflow-frontend/src/routes/TaskShow.tsx
@@ -116,7 +116,6 @@ export default function TaskShow() {
       if (!result.can_complete) {
         navigateToInterstitial(result);
       }
-      window.scrollTo(0, 0); // Scroll back to the top of the page
 
       /*  Disable call to load previous tasks -- do not display menu.
       const url = `/v1.0/process-instances/for-me/${modifyProcessIdentifierForPathParam(