diff --git a/src/components/Aside.tsx b/src/components/Aside.tsx
index 17417b4..970484c 100644
--- a/src/components/Aside.tsx
+++ b/src/components/Aside.tsx
@@ -28,7 +28,10 @@ const Aside = ({ aside, setAside }: Props) => {
           <h2>Elements</h2>
         </li>
         <li className="aside__list__element">
-          <Link to={"/posts"}>
+          <Link
+            to={"/posts"}
+            onClick={() => localStorage.setItem("lastLocation", "/posts")}
+          >
             <BsFillFileEarmarkPostFill className="aside__list__element__img" />
             <span>Posts</span>
           </Link>
@@ -38,7 +41,12 @@ const Aside = ({ aside, setAside }: Props) => {
           <h2>Account</h2>
         </li>
         <li className="aside__list__element">
-          <Link to={"/user_details"}>
+          <Link
+            to={"/user_details"}
+            onClick={() =>
+              localStorage.setItem("lastLocation", "/user_details")
+            }
+          >
             <CgDetailsLess className="aside__list__element__img" />
             <span>Details</span>
           </Link>
diff --git a/src/components/Nav.tsx b/src/components/Nav.tsx
index f1810c5..f65aa8b 100644
--- a/src/components/Nav.tsx
+++ b/src/components/Nav.tsx
@@ -24,7 +24,11 @@ const Nav = ({ aside, setAside }: Props) => {
       <div className="container">
         <div className="nav inner">
           <div className="nav__left">
-            <Link to={"/dashboard"} className="nav__img">
+            <Link
+              to={"/dashboard"}
+              className="nav__img"
+              onClick={() => localStorage.setItem("lastLocation", "/dashboard")}
+            >
               <ImStatsDots />
             </Link>
             <GiHamburgerMenu
diff --git a/src/pages/Login.tsx b/src/pages/Login.tsx
index 067e682..92781f4 100644
--- a/src/pages/Login.tsx
+++ b/src/pages/Login.tsx
@@ -7,6 +7,7 @@ import { useNavigate } from "react-router-dom";
 import { cred } from "../user";
 
 const Login = () => {
+  const lastLocation = localStorage.getItem("lastLocation");
   const [valid, setValid] = useState({
     username: "",
     password: "",
@@ -28,7 +29,7 @@ const Login = () => {
 
   useEffect(() => {
     if (user.username) {
-      navigate("/dashboard");
+      navigate(lastLocation || "/dashboard");
     }
   }, [user]);