diff --git a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
index 233bcd7e5..2d068dde1 100644
--- a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
+++ b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html
@@ -13,7 +13,7 @@
         <input
           formControlName="name"
           matInput
-          (keydown.enter)="$event.preventDefault()"
+          (keydown.enter)="$event.stopPropagation()"
         />
       </mat-form-field>
     </div>
@@ -34,7 +34,7 @@
           formControlName="balance"
           matInput
           type="number"
-          (keydown.enter)="$event.preventDefault()"
+          (keydown.enter)="$event.stopPropagation()"
         />
         <span class="ml-2" matTextSuffix>{{ data.account.currency }}</span>
       </mat-form-field>
@@ -75,7 +75,7 @@
     </div>
   </div>
   <div class="justify-content-end" mat-dialog-actions>
-    <button i18n mat-button (click)="onCancel()">Cancel</button>
+    <button i18n mat-button type="button" (click)="onCancel()">Cancel</button>
     <button
       color="primary"
       mat-flat-button