diff --git a/apps/web/src/app/(afterLogin)/workspace/page.tsx b/apps/web/src/app/(afterLogin)/workspace/page.tsx
index e165233..4f8c052 100644
--- a/apps/web/src/app/(afterLogin)/workspace/page.tsx
+++ b/apps/web/src/app/(afterLogin)/workspace/page.tsx
@@ -49,10 +49,17 @@ const Home = () => {
     name: vocabulary.name,
     createdAt: new Date(vocabulary.createdAt),
   }))
+
+  if (window.opener) {
+    window.close()
+  }
+
   if (response == null) {
     return null
   }
+
   const isDisabled = response?.result.length >= 3
+
   return (
     <div className={workspaceContainer}>
       <div className={workspaceHeader}>
diff --git a/apps/web/src/app/(beforeLogin)/auth/token/page.tsx b/apps/web/src/app/(beforeLogin)/auth/token/page.tsx
index 92ca8c9..1cdd8f0 100644
--- a/apps/web/src/app/(beforeLogin)/auth/token/page.tsx
+++ b/apps/web/src/app/(beforeLogin)/auth/token/page.tsx
@@ -19,6 +19,10 @@ const AuthCallbackPage = ({
   const router = useRouter()
   const queryClient = useQueryClient()
 
+  if (!access || !refresh) {
+    router.push('/login')
+  }
+
   useEffect(() => {
     Cookies.set('access', access, {
       secure: true,