diff --git a/src/route-widgets/LoginRoute/EmailForm.tsx b/src/route-widgets/LoginRoute/EmailForm.tsx
index 4159961..1ce5d38 100644
--- a/src/route-widgets/LoginRoute/EmailForm.tsx
+++ b/src/route-widgets/LoginRoute/EmailForm.tsx
@@ -72,6 +72,7 @@ export default function EmailForm({onLogin}: EmailFormProps): ReactElement {
 						<TextField
 							key="email"
 							fullWidth
+							autoFocus
 							name="email"
 							id="email"
 							label="Email"
diff --git a/src/route-widgets/SignupRoute/EmailForm/EmailForm.tsx b/src/route-widgets/SignupRoute/EmailForm/EmailForm.tsx
index 7db35d6..1fde5e5 100644
--- a/src/route-widgets/SignupRoute/EmailForm/EmailForm.tsx
+++ b/src/route-widgets/SignupRoute/EmailForm/EmailForm.tsx
@@ -92,6 +92,7 @@ export default function EmailForm({onSignUp, serverSettings}: EmailFormProps): R
 							<TextField
 								key="email"
 								fullWidth
+								autoFocus
 								name="email"
 								id="email"
 								label={t("routes.SignupRoute.forms.email.form.email.label")}