diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ab22e38d..c2b8a0d19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fixed the enter key press to submit the form of the login with access token dialog
 - Fixed an issue in the database seeding process caused by unresolved environment variables in `DATABASE_URL`
 
 ## 2.209.0 - 2025-10-18
diff --git a/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html b/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html
index e19d190c4..b51802caf 100644
--- a/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html
+++ b/apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html
@@ -2,13 +2,14 @@
 
 <div class="py-3" mat-dialog-content>
   <div class="align-items-center d-flex flex-column">
-    <form class="w-100" (ngSubmit)="onLoginWithAccessToken()">
+    <form class="w-100">
       <mat-form-field appearance="outline" class="without-hint w-100">
         <mat-label i18n>Security Token</mat-label>
         <input
           matInput
           [formControl]="accessTokenFormControl"
           [type]="isAccessTokenHidden ? 'password' : 'text'"
+          (keydown.enter)="onLoginWithAccessToken(); $event.preventDefault()"
         />
         <button
           mat-button
@@ -21,35 +22,37 @@
           />
         </button>
       </mat-form-field>
+
+      @if (data.hasPermissionToUseSocialLogin) {
+        <div class="my-3 text-center text-muted" i18n>or</div>
+        <div class="d-flex flex-column">
+          <button
+            class="mb-2 px-4 rounded-pill"
+            mat-stroked-button
+            (click)="onLoginWithInternetIdentity()"
+          >
+            <img
+              class="mr-2"
+              src="../assets/icons/internet-computer.svg"
+              style="height: 0.75rem"
+            /><span i18n>Sign in with Internet Identity</span>
+          </button>
+          <a
+            class="px-4 rounded-pill"
+            href="../api/v1/auth/google"
+            mat-stroked-button
+            ><img
+              class="mr-2"
+              src="../assets/icons/google.svg"
+              style="height: 1rem"
+            /><span i18n>Sign in with Google</span></a
+          >
+        </div>
+      }
     </form>
-    @if (data.hasPermissionToUseSocialLogin) {
-      <div class="my-3 text-center text-muted" i18n>or</div>
-      <div class="d-flex flex-column">
-        <button
-          class="mb-2 px-4 rounded-pill"
-          mat-stroked-button
-          (click)="onLoginWithInternetIdentity()"
-        >
-          <img
-            class="mr-2"
-            src="../assets/icons/internet-computer.svg"
-            style="height: 0.75rem"
-          /><span i18n>Sign in with Internet Identity</span>
-        </button>
-        <a
-          class="px-4 rounded-pill"
-          href="../api/v1/auth/google"
-          mat-stroked-button
-          ><img
-            class="mr-2"
-            src="../assets/icons/google.svg"
-            style="height: 1rem"
-          /><span i18n>Sign in with Google</span></a
-        >
-      </div>
-    }
   </div>
 </div>
+
 <div mat-dialog-actions>
   <div class="flex-grow-1">
     <mat-checkbox color="primary" i18n (change)="onChangeStaySignedIn($event)"