diff --git a/scm-ui/ui-components/src/ErrorBoundary.tsx b/scm-ui/ui-components/src/ErrorBoundary.tsx
index 33c8a48494..3d0144b95b 100644
--- a/scm-ui/ui-components/src/ErrorBoundary.tsx
+++ b/scm-ui/ui-components/src/ErrorBoundary.tsx
@@ -72,10 +72,10 @@ class ErrorBoundary extends React.Component<Props, State> {
   }
 
   redirectToLogin = (error: Error) => {
-    const { loginLink } = this.props;
+    const { loginLink, location } = this.props;
     if (error instanceof MissingLinkError) {
       if (loginLink) {
-        window.location.assign(withContextPath("/login"));
+        window.location.assign(withContextPath("/login?from=" + location.pathname));
       }
     }
   };