diff --git a/app/javascript/pages/auth/Login.tsx b/app/javascript/pages/auth/Login.tsx
index 412c6d3..2b6d2fc 100644
--- a/app/javascript/pages/auth/Login.tsx
+++ b/app/javascript/pages/auth/Login.tsx
@@ -48,6 +48,7 @@ export default function Login() {
               id="email"
               type="email"
               autoComplete="email"
+              autoFocus
               required
               value={form.data.email}
               onChange={(e) => form.setData("email", e.target.value)}
diff --git a/app/javascript/pages/auth/Signup.tsx b/app/javascript/pages/auth/Signup.tsx
index c4bac28..0249996 100644
--- a/app/javascript/pages/auth/Signup.tsx
+++ b/app/javascript/pages/auth/Signup.tsx
@@ -45,6 +45,7 @@ export default function Signup() {
               id="email"
               type="email"
               autoComplete="email"
+              autoFocus
               required
               aria-invalid={!!errors.email}
               value={form.data.email}