diff --git a/src/Components/AppRoutes/index.js b/src/Components/AppRoutes/index.js
index c4d1a12..9fcb432 100644
--- a/src/Components/AppRoutes/index.js
+++ b/src/Components/AppRoutes/index.js
@@ -97,7 +97,7 @@ export function AppRoutes({ setUserSession }) {
       />
 
       <Route
-        path={`${Constants.ROUTE_PATHS.STORE.OVERVIEW}/:status/:storeId/${Constants.ROUTE_PATHS.STORE.CALENDAR_AUTH}`}
+        path={`${Constants.ROUTE_PATHS.STORE.OVERVIEW}/${Constants.ROUTE_PATHS.STORE.CALENDAR_AUTH}/:status/`}
         element={
           <MySupsenseFallback>
             <StoreCalendarAuth />
diff --git a/src/Pages/Store/Calendar/Auth/index.js b/src/Pages/Store/Calendar/Auth/index.js
index a4d3ca8..4c0cdbc 100644
--- a/src/Pages/Store/Calendar/Auth/index.js
+++ b/src/Pages/Store/Calendar/Auth/index.js
@@ -1,4 +1,4 @@
-import { Button, Result, Spin, Typography, notification } from "antd";
+import { Button, Flex, Result, Spin, Typography, notification } from "antd";
 import { Link, useParams, useNavigate } from "react-router-dom";
 import { Constants, myFetch } from "../../../../utils";
 import { useEffect, useState } from "react";
@@ -56,8 +56,10 @@ export default function StoreCalendarAuth() {
             : t("calendar.authFailed.description")
         }
         extra={[
-          <div key="1">
-            <Link to={`${Constants.ROUTE_PATHS.STORE.CALENDAR}/${storeId}`}>
+          <Flex key="1" vertical>
+            <Link
+              to={`${Constants.ROUTE_PATHS.STORE.OVERVIEW}/${storeId}/${Constants.ROUTE_PATHS.STORE.CALENDAR}`}
+            >
               <Button>
                 {status === "finish"
                   ? t("calendar.authFinish.button")
@@ -66,7 +68,7 @@ export default function StoreCalendarAuth() {
             </Link>
 
             {status === "finish" && <CountdownRedirect storeId={storeId} />}
-          </div>,
+          </Flex>,
         ]}
       />
     </>
@@ -86,7 +88,9 @@ function CountdownRedirect({ storeId }) {
       }, 1000);
       return () => clearTimeout(timer);
     } else {
-      navigate(`${Constants.ROUTE_PATHS.STORE.CALENDAR}/${storeId}`);
+      navigate(
+        `${Constants.ROUTE_PATHS.STORE.OVERVIEW}/${storeId}/${Constants.ROUTE_PATHS.STORE.CALENDAR}`
+      );
     }
   }, [count, navigate]);