diff --git a/frontend/src/authentication/components/AuthGuard.js b/frontend/src/authentication/components/AuthGuard.js
index 73f280943..8410407ab 100644
--- a/frontend/src/authentication/components/AuthGuard.js
+++ b/frontend/src/authentication/components/AuthGuard.js
@@ -3,6 +3,10 @@ import { useState } from 'react';
 import { Navigate, useLocation } from 'react-router-dom';
 import { Login } from '../views/Login';
 import { useAuth } from '../hooks';
+import {
+  RegexToValidateWindowPathName,
+  WindowPathLengthThreshold
+} from '../../utils';
 
 export const AuthGuard = (props) => {
   const { children } = props;
@@ -15,6 +19,15 @@ export const AuthGuard = (props) => {
       setRequestedLocation(location.pathname);
     }
 
+    // If the user is not authenticated and if the session storage is empty for the key 'window-location'
+    // Also, another check of location.path is added to prevent overriding the window-location object when the user logs out and redirected to the landing page URL. Here, when the user is logged out the session storage stores '/' which is not needed
+    if (
+      !sessionStorage.getItem('window-location') &&
+      location.pathname !== '/'
+    ) {
+      sessionStorage.setItem('window-location', location.pathname);
+    }
+
     return <Login />;
   }
 
@@ -23,6 +36,25 @@ export const AuthGuard = (props) => {
     return <Navigate to={requestedLocation} />;
   }
 
+  // When session storage contained path is not same as the current location.pathname ( usually after authentication )
+  // Redirect the user to the session storage stored pathname.
+  if (
+    sessionStorage.getItem('window-location') &&
+    location.pathname !== sessionStorage.getItem('window-location')
+  ) {
+    const windowPathLocation = sessionStorage.getItem('window-location');
+    sessionStorage.removeItem('window-location');
+    // Check if the window-location only contains alphanumeric and / in it and its not tampered
+    if (!RegexToValidateWindowPathName.test(windowPathLocation))
+      return <>{children}</>;
+    // A guardrail to limit the string of the pathname to a certain characters
+    if (windowPathLocation.length > WindowPathLengthThreshold)
+      return <>{children}</>;
+    return <Navigate to={windowPathLocation} replace={true} />;
+  } else {
+    sessionStorage.removeItem('window-location');
+  }
+
   return <>{children}</>;
 };
 
diff --git a/frontend/src/authentication/contexts/GenericAuthContext.js b/frontend/src/authentication/contexts/GenericAuthContext.js
index d83d0f0f7..07fbcc4df 100644
--- a/frontend/src/authentication/contexts/GenericAuthContext.js
+++ b/frontend/src/authentication/contexts/GenericAuthContext.js
@@ -249,6 +249,7 @@ export const GenericAuthProvider = (props) => {
           }
         });
       }
+      sessionStorage.removeItem('window-location');
     } catch (error) {
       console.error('Failed to signout', error);
     }
@@ -279,6 +280,7 @@ export const GenericAuthProvider = (props) => {
         }
       });
     }
+    sessionStorage.removeItem('window-location');
   };
 
   return (
diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js
index a92896faa..acc3b6737 100644
--- a/frontend/src/utils/constants.js
+++ b/frontend/src/utils/constants.js
@@ -25,3 +25,6 @@ export const AwsRegions = [
   { name: 'AWS GovCloud (US-East)', code: 'us-gov-east-1' },
   { name: 'AWS GovCloud (US)', code: 'us-gov-west-1' }
 ];
+
+export const RegexToValidateWindowPathName = /^[a-zA-Z0-9/]*$/;
+export const WindowPathLengthThreshold = 50;