diff --git a/src/App.tsx b/src/App.tsx
index 29ab83b..f79f052 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -2,7 +2,7 @@ import { BrowserRouter, Outlet, Route, Routes } from "react-router-dom"
 
 import { Header } from "./pages/template/Header.tsx"
 import "./style/app.css"
-import { lazy, ReactNode, Suspense } from "react"
+import { lazy, ReactNode, Suspense, useEffect } from "react"
 import { BASE } from "./Constants.ts"
 
 const HomePage = lazy(() => import("./pages/HomePage.tsx"))
@@ -15,6 +15,7 @@ const NewTacticPage = lazy(() => import("./pages/NewTacticPage.tsx"))
 const Editor = lazy(() => import("./pages/Editor.tsx"))
 
 export default function App() {
+
     function suspense(node: ReactNode) {
         return (
             <Suspense fallback={<p>Loading, please wait...</p>}>
diff --git a/src/pages/NewTacticPage.tsx b/src/pages/NewTacticPage.tsx
index ab77f13..98568d3 100644
--- a/src/pages/NewTacticPage.tsx
+++ b/src/pages/NewTacticPage.tsx
@@ -6,8 +6,8 @@ import halfCourt from "../assets/court/half_court.svg"
 import { CourtType } from "../model/tactic/Tactic.ts"
 import { useCallback } from "react"
 import { fetchAPI } from "../Fetcher.ts"
-import { getSession } from "../api/session.ts"
-import { useNavigate } from "react-router-dom"
+import { getSession, saveSession } from "../api/session.ts"
+import { useLocation, useNavigate } from "react-router-dom"
 
 export const DEFAULT_TACTIC_NAME = "Nouvelle tactique"
 
@@ -45,6 +45,7 @@ function CourtKindButton({
     courtType: CourtType
 }) {
     const navigate = useNavigate()
+    const location = useLocation()
 
     return (
         <div
@@ -65,6 +66,7 @@ function CourtKindButton({
                 )
 
                 if (response.status === 401) {
+                    saveSession({...getSession(), urlTarget: location.pathname})
                     // if unauthorized
                     navigate("/login")
                     return
@@ -72,7 +74,7 @@ function CourtKindButton({
 
                 const { id } = await response.json()
                 navigate(`/tactic/${id}/edit`)
-            }, [courtType, navigate])}>
+            }, [courtType, location.pathname, navigate])}>
             <div className="court-kind-button-top">
                 <div className="court-kind-button-image-div">
                     <img