diff --git a/frontend/CLAUDE.md b/frontend/CLAUDE.md
index f91990fe2..70fe660c1 100644
--- a/frontend/CLAUDE.md
+++ b/frontend/CLAUDE.md
@@ -172,6 +172,21 @@ Database configurations are defined in `src/app/consts/databases.ts`.
 - Example: `@if (condition) { ... }` instead of `<div *ngIf="condition">...</div>`
 - Example: `@for (item of items; track item.id) { ... }` instead of `<div *ngFor="let item of items">...</div>`
 
+### Mat-Dialog Forms
+- **When a `mat-dialog` contains form elements and presumes form submission, `mat-dialog-content` and `mat-dialog-actions` MUST be wrapped in a `<form>` tag with an `(ngSubmit)` handler, and the primary action button inside `mat-dialog-actions` must use `type="submit"`.** This ensures the dialog properly supports keyboard submission (Enter key) and follows accessibility best practices.
+- Example:
+  ```html
+  <form [formGroup]="myForm" (ngSubmit)="handleSubmit()">
+    <mat-dialog-content>
+      <!-- form fields -->
+    </mat-dialog-content>
+    <mat-dialog-actions>
+      <button mat-button type="button" mat-dialog-close>Cancel</button>
+      <button mat-flat-button type="submit" color="primary">Submit</button>
+    </mat-dialog-actions>
+  </form>
+  ```
+
 ### Naming Conventions
 - **Files**: `kebab-case.component.ts`
 - **Classes**: `PascalCase` (e.g., `DbTableSettingsComponent`)
diff --git a/frontend/src/app/components/company/invite-member-dialog/invite-member-dialog.component.html b/frontend/src/app/components/company/invite-member-dialog/invite-member-dialog.component.html
index 8445e7932..336d49b10 100644
--- a/frontend/src/app/components/company/invite-member-dialog/invite-member-dialog.component.html
+++ b/frontend/src/app/components/company/invite-member-dialog/invite-member-dialog.component.html
@@ -79,7 +79,7 @@ <h1 mat-dialog-title>Add member to <strong>{{company.name}}</strong> company</h1
     </app-turnstile>
     <mat-dialog-actions align="end">
         <button type="button" mat-flat-button mat-dialog-close>Cancel</button>
-        <button mat-flat-button color="primary"
+        <button type="submit" mat-flat-button color="primary"
             [disabled]="submitting || addUserForm.form.invalid || (isSaas && !turnstileToken)">
             Add
         </button>
diff --git a/frontend/src/app/components/connect-db/db-connection-delete-dialog/db-connection-delete-dialog.component.html b/frontend/src/app/components/connect-db/db-connection-delete-dialog/db-connection-delete-dialog.component.html
index cf24762d6..27066c32a 100644
--- a/frontend/src/app/components/connect-db/db-connection-delete-dialog/db-connection-delete-dialog.component.html
+++ b/frontend/src/app/components/connect-db/db-connection-delete-dialog/db-connection-delete-dialog.component.html
@@ -1,41 +1,40 @@
 <h1 mat-dialog-title>Delete <strong>{{ connectionName }}</strong> connection</h1>
+<form #deleteConnectionForm="ngForm" class="form" (ngSubmit)="deleteConnection()">
 <mat-dialog-content>
     <p class="mat-body">
       Before you delete the connection, please let us know why.
       Every bit of feedback helps!
     </p>
     <br>
-    <form action="" #deleteConnectionForm="ngForm" class="form">
-        <mat-radio-group required
-            name="reasons"
-            class="radio-group"
-            [(ngModel)]="reason">
-            <mat-radio-button value='missing-features' class="radio-button">
-                Missing features I need
-            </mat-radio-button>
-            <mat-radio-button value='technical-issues' class="radio-button">
-                Technical issues
-            </mat-radio-button>
-            <mat-radio-button value='another-product' class="radio-button">
-                Another product
-            </mat-radio-button>
-            <mat-radio-button value='other' class="radio-button">
-                Other
-            </mat-radio-button>
-        </mat-radio-group>
-        <mat-form-field appearance="outline" class="message">
-            <mat-label>Anything you want to share? (optional)</mat-label>
-            <textarea matInput resizeToFitContent rows="8" name="message"
-                [(ngModel)]="message"
-            ></textarea>
-        </mat-form-field>
-    </form>
+    <mat-radio-group required
+        name="reasons"
+        class="radio-group"
+        [(ngModel)]="reason">
+        <mat-radio-button value='missing-features' class="radio-button">
+            Missing features I need
+        </mat-radio-button>
+        <mat-radio-button value='technical-issues' class="radio-button">
+            Technical issues
+        </mat-radio-button>
+        <mat-radio-button value='another-product' class="radio-button">
+            Another product
+        </mat-radio-button>
+        <mat-radio-button value='other' class="radio-button">
+            Other
+        </mat-radio-button>
+    </mat-radio-group>
+    <mat-form-field appearance="outline" class="message">
+        <mat-label>Anything you want to share? (optional)</mat-label>
+        <textarea matInput resizeToFitContent rows="8" name="message"
+            [(ngModel)]="message"
+        ></textarea>
+    </mat-form-field>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
-  <button mat-flat-button mat-dialog-close mat-dialog-close="cancel">Abort</button>
-  <button mat-flat-button color="warn"
-    [disabled]="submitting"
-    (click)="deleteConnection()">
+  <button type="button" mat-flat-button mat-dialog-close mat-dialog-close="cancel">Abort</button>
+  <button type="submit" mat-flat-button color="warn"
+    [disabled]="submitting">
     Proceed
   </button>
-</mat-dialog-actions>
\ No newline at end of file
+</mat-dialog-actions>
+</form>
\ No newline at end of file
diff --git a/frontend/src/app/components/connections-list/hosted-database-rename-dialog/hosted-database-rename-dialog.component.html b/frontend/src/app/components/connections-list/hosted-database-rename-dialog/hosted-database-rename-dialog.component.html
index 90c45d50d..5a24b677c 100644
--- a/frontend/src/app/components/connections-list/hosted-database-rename-dialog/hosted-database-rename-dialog.component.html
+++ b/frontend/src/app/components/connections-list/hosted-database-rename-dialog/hosted-database-rename-dialog.component.html
@@ -1,16 +1,18 @@
 <h1 mat-dialog-title>Name your connection</h1>
 
+<form (ngSubmit)="save()">
 <mat-dialog-content class="rename-dialog__content">
 	<p class="rename-dialog__description">Give your hosted database a friendly title so you can find it easily.</p>
 	<mat-form-field appearance="outline" class="rename-dialog__field">
 		<mat-label>Connection title</mat-label>
-		<input matInput [(ngModel)]="title" placeholder="e.g. Production DB, Staging, My App" (keyup.enter)="save()" cdkFocusInitial>
+		<input matInput [(ngModel)]="title" name="title" placeholder="e.g. Production DB, Staging, My App" cdkFocusInitial>
 	</mat-form-field>
 </mat-dialog-content>
 
 <mat-dialog-actions align="end" class="rename-dialog__actions">
 	<button type="button" mat-button mat-dialog-close>Skip</button>
-	<button type="button" mat-flat-button color="accent" [disabled]="!title.trim() || saving" (click)="save()">
+	<button type="submit" mat-flat-button color="accent" [disabled]="!title.trim() || saving">
 		{{ saving ? 'Saving...' : 'Save' }}
 	</button>
 </mat-dialog-actions>
+</form>
diff --git a/frontend/src/app/components/dashboard/db-table-view/db-table-export-dialog/db-table-export-dialog.component.html b/frontend/src/app/components/dashboard/db-table-view/db-table-export-dialog/db-table-export-dialog.component.html
index cad5347b4..2819d6316 100644
--- a/frontend/src/app/components/dashboard/db-table-view/db-table-export-dialog/db-table-export-dialog.component.html
+++ b/frontend/src/app/components/dashboard/db-table-view/db-table-export-dialog/db-table-export-dialog.component.html
@@ -23,8 +23,8 @@ <h1 mat-dialog-title>Export</h1>
         </mat-radio-group>
     </mat-dialog-content>
     <mat-dialog-actions align="end">
-        <button mat-flat-button mat-dialog-close>Cancel</button>
-        <button mat-flat-button type="" color="primary" mat-dialog-close="export">
+        <button type="button" mat-flat-button mat-dialog-close>Cancel</button>
+        <button type="submit" mat-flat-button color="primary" [disabled]="submitting">
             Export
         </button>
     </mat-dialog-actions>
diff --git a/frontend/src/app/components/dashboard/db-tables-list/db-folder-edit-dialog/db-folder-edit-dialog.component.html b/frontend/src/app/components/dashboard/db-tables-list/db-folder-edit-dialog/db-folder-edit-dialog.component.html
index 48bd1eb3b..b178179d9 100644
--- a/frontend/src/app/components/dashboard/db-tables-list/db-folder-edit-dialog/db-folder-edit-dialog.component.html
+++ b/frontend/src/app/components/dashboard/db-tables-list/db-folder-edit-dialog/db-folder-edit-dialog.component.html
@@ -2,6 +2,7 @@ <h1 mat-dialog-title>
     Edit folder
 </h1>
 
+<form (ngSubmit)="onSave()">
 <mat-dialog-content class="dialog-body">
     <!-- Folder Name Section -->
     <div class="folder-name-section">
@@ -9,6 +10,7 @@ <h1 mat-dialog-title>
             <mat-label>Folder name</mat-label>
             <input matInput
                    type="text"
+                   name="folderName"
                    [(ngModel)]="folder.name"
                    [disabled]="isAllTablesFolder()"
                    required
@@ -49,7 +51,7 @@ <h4>Manage tables in this folder</h4>
         <div class="table-list">
             <div *ngFor="let table of tables" class="table-item">
                 <span class="table-name">{{getTableName(table)}}</span>
-                <button mat-button
+                <button mat-button type="button"
                         class="action-button"
                         [class.add-button]="!isTableInFolder(table)"
                         [class.remove-button]="isTableInFolder(table)"
@@ -62,6 +64,7 @@ <h4>Manage tables in this folder</h4>
 </mat-dialog-content>
 
 <mat-dialog-actions align="end">
-    <button mat-button (click)="onCancel()">Cancel</button>
-    <button mat-button color="primary" (click)="onSave()">Save</button>
-</mat-dialog-actions>
\ No newline at end of file
+    <button type="button" mat-button (click)="onCancel()">Cancel</button>
+    <button type="submit" mat-button color="primary">Save</button>
+</mat-dialog-actions>
+</form>
\ No newline at end of file
diff --git a/frontend/src/app/components/hosted-databases/hosted-database-rename-dialog/hosted-database-rename-dialog.component.html b/frontend/src/app/components/hosted-databases/hosted-database-rename-dialog/hosted-database-rename-dialog.component.html
index 1d692e987..55f22d8df 100644
--- a/frontend/src/app/components/hosted-databases/hosted-database-rename-dialog/hosted-database-rename-dialog.component.html
+++ b/frontend/src/app/components/hosted-databases/hosted-database-rename-dialog/hosted-database-rename-dialog.component.html
@@ -1,16 +1,16 @@
 <h1 mat-dialog-title>Rename <strong>{{ data.databaseName }}</strong></h1>
+<form (ngSubmit)="save()">
 <mat-dialog-content>
 	<mat-form-field appearance="outline" class="rename-dialog__field">
 		<mat-label>Connection name</mat-label>
-		<input matInput [(ngModel)]="title" placeholder="e.g. Production DB, Staging, My App"
-			(keyup.enter)="save()" cdkFocusInitial>
+		<input matInput [(ngModel)]="title" name="title" placeholder="e.g. Production DB, Staging, My App" cdkFocusInitial>
 	</mat-form-field>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
 	<button type="button" mat-flat-button mat-dialog-close>Cancel</button>
-	<button type="button" mat-flat-button color="accent"
-		[disabled]="!title.trim() || submitting()"
-		(click)="save()">
+	<button type="submit" mat-flat-button color="accent"
+		[disabled]="!title.trim() || submitting()">
 		{{ submitting() ? 'Saving...' : 'Save' }}
 	</button>
 </mat-dialog-actions>
+</form>
diff --git a/frontend/src/app/components/secrets/master-password-dialog/master-password-dialog.component.html b/frontend/src/app/components/secrets/master-password-dialog/master-password-dialog.component.html
index a5a13ce30..d33e6be05 100644
--- a/frontend/src/app/components/secrets/master-password-dialog/master-password-dialog.component.html
+++ b/frontend/src/app/components/secrets/master-password-dialog/master-password-dialog.component.html
@@ -3,6 +3,7 @@ <h2 mat-dialog-title>
     Master Password Required
 </h2>
 
+<form (ngSubmit)="onSubmit()">
 <mat-dialog-content>
     <p class="description">
         This secret is protected with master password encryption.
@@ -12,9 +13,9 @@ <h2 mat-dialog-title>
     <mat-form-field appearance="outline" class="full-width">
         <mat-label>Master Password</mat-label>
         <input matInput
+            name="masterPassword"
             [(ngModel)]="masterPassword"
             [type]="showPassword ? 'text' : 'password'"
-            (keyup.enter)="onSubmit()"
             placeholder="Enter master password"
             data-testid="master-password-input">
         <button mat-icon-button matSuffix type="button"
@@ -27,11 +28,11 @@ <h2 mat-dialog-title>
 </mat-dialog-content>
 
 <mat-dialog-actions align="end">
-    <button mat-button mat-dialog-close>Cancel</button>
-    <button mat-flat-button color="primary"
-        (click)="onSubmit()"
+    <button type="button" mat-button mat-dialog-close>Cancel</button>
+    <button type="submit" mat-flat-button color="primary"
         data-testid="master-password-submit-button">
         <mat-icon>lock_open</mat-icon>
         Unlock
     </button>
 </mat-dialog-actions>
+</form>
diff --git a/frontend/src/app/components/user-settings/account-delete-dialog/account-delete-dialog.component.html b/frontend/src/app/components/user-settings/account-delete-dialog/account-delete-dialog.component.html
index 561ce0dc7..6a2fe7bff 100644
--- a/frontend/src/app/components/user-settings/account-delete-dialog/account-delete-dialog.component.html
+++ b/frontend/src/app/components/user-settings/account-delete-dialog/account-delete-dialog.component.html
@@ -1,36 +1,35 @@
 <h1 mat-dialog-title>Delete <strong>{{ userEmail }}</strong> account</h1>
+<form #deleteConnectionForm="ngForm" class="form" (ngSubmit)="openDeleteConfirmation()">
 <mat-dialog-content>
     <p class="mat-body">
         Tell us why are you deleting your account.
     </p>
     <br>
-    <form action="" #deleteConnectionForm="ngForm" class="form">
-        <mat-radio-group required
-            name="reasons"
-            class="radio-group"
-            [(ngModel)]="reason">
-            <div *ngFor="let reasonItem of reasonsList">
-                <mat-radio-button [value]="reasonItem.id" class="radio-button">
-                    {{ reasonItem.caption }}
-                </mat-radio-button>
-                <p *ngIf="reasonItem.message && reason === reasonItem.id"
-                    [innerHtml]="reasonItem.message"
-                    class="mat-body-1 radio-group__message">
-                </p>
-            </div>
-        </mat-radio-group>
-        <mat-form-field appearance="outline" class="message">
-            <mat-label>Anything you want to share? (optional)</mat-label>
-            <textarea matInput resizeToFitContent rows="3" name="message"
-                [(ngModel)]="message"
-            ></textarea>
-        </mat-form-field>
-    </form>
+    <mat-radio-group required
+        name="reasons"
+        class="radio-group"
+        [(ngModel)]="reason">
+        <div *ngFor="let reasonItem of reasonsList">
+            <mat-radio-button [value]="reasonItem.id" class="radio-button">
+                {{ reasonItem.caption }}
+            </mat-radio-button>
+            <p *ngIf="reasonItem.message && reason === reasonItem.id"
+                [innerHtml]="reasonItem.message"
+                class="mat-body-1 radio-group__message">
+            </p>
+        </div>
+    </mat-radio-group>
+    <mat-form-field appearance="outline" class="message">
+        <mat-label>Anything you want to share? (optional)</mat-label>
+        <textarea matInput resizeToFitContent rows="3" name="message"
+            [(ngModel)]="message"
+        ></textarea>
+    </mat-form-field>
 </mat-dialog-content>
 <mat-dialog-actions align="end">
-  <button mat-flat-button mat-dialog-close mat-dialog-close="cancel">Abort</button>
-  <button mat-flat-button color="warn"
-    (click)="openDeleteConfirmation()">
+  <button type="button" mat-flat-button mat-dialog-close mat-dialog-close="cancel">Abort</button>
+  <button type="submit" mat-flat-button color="warn">
     Delete
   </button>
 </mat-dialog-actions>
+</form>