diff --git a/src/pages/Login.jsx b/src/pages/Login.jsx
index 4a397d2..edbd086 100644
--- a/src/pages/Login.jsx
+++ b/src/pages/Login.jsx
@@ -20,6 +20,8 @@ function Login() {
 
     const loginDisabled = usernameOrEmail == "" || password == "";
 
+    const handleFieldEnter = (e) => { if (e.key === 'Enter') { handleLogin(); } }
+
     const handleLogin = async () => {
         if (!usernameOrEmail || usernameOrEmail == "" || !password || password == "") {
             ToastWizard.standard("error", "All fields are required.")
@@ -104,12 +106,12 @@ function Login() {
                         <Fieldset.Content>
                             <Field.Root>
                                 <Field.Label fontSize={'md'}>Username or Email</Field.Label>
-                                <Input size={'lg'} value={usernameOrEmail} onChange={(e) => setUsernameOrEmail(e.target.value)} name="name" placeholder='e.g johndoe' />
+                                <Input onKeyUp={handleFieldEnter} size={'lg'} value={usernameOrEmail} onChange={(e) => setUsernameOrEmail(e.target.value)} name="name" placeholder='e.g johndoe' />
                             </Field.Root>
 
                             <Field.Root>
                                 <Field.Label fontSize={'md'}>Password</Field.Label>
-                                <PasswordInput size={'lg'} value={password} onChange={(e) => setPassword(e.target.value)} placeholder="Enter password" />
+                                <PasswordInput onKeyUp={handleFieldEnter} size={'lg'} value={password} onChange={(e) => setPassword(e.target.value)} placeholder="Enter password" />
                             </Field.Root>
                         </Fieldset.Content>