diff --git a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/speaking-times/speaking-times.component.html b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/speaking-times/speaking-times.component.html
index 553310cd74..76a53be133 100644
--- a/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/speaking-times/speaking-times.component.html
+++ b/client/src/app/site/pages/meetings/modules/list-of-speakers-content/components/speaking-times/speaking-times.component.html
@@ -63,7 +63,7 @@
 <ng-template #totalTimeDialog>
     <h2 mat-dialog-title>{{ currentEntry.name }}</h2>
     <mat-dialog-content class="os-form-card-mobile">
-        <form [formGroup]="totalTimeForm" (keydown)="onKeyDown($event)">
+        <form [formGroup]="totalTimeForm" (keydown)="onKeyDown($event)" tabindex="-1">
             <!-- total time -->
             <mat-form-field>
                 <mat-label>{{ 'Total time' | translate }}</mat-label>
@@ -77,7 +77,7 @@ <h2 mat-dialog-title>{{ currentEntry.name }}</h2>
 
     <mat-dialog-actions>
         <button mat-button [disabled]="!totalTimeForm.valid" [mat-dialog-close]="true">
-            <span>{{ 'Reset' | translate }}</span>
+            <span>{{ 'OK' | translate }}</span>
         </button>
         <button mat-button [mat-dialog-close]="false">
             <span>{{ 'Cancel' | translate }}</span>
@@ -89,7 +89,7 @@ <h2 mat-dialog-title>{{ currentEntry.name }}</h2>
 <ng-template #addRemoveTimeDialog>
     <h2 mat-dialog-title>{{ currentEntry.name }}</h2>
     <div class="os-form-card-mobile" mat-dialog-content>
-        <form (keydown)="onKeyDown($event)">
+        <form (keydown)="onKeyDown($event)" tabindex="-1">
             <!-- total time -->
             <mat-form-field>
                 <mat-label>{{ 'Time' | translate }}</mat-label>
diff --git a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.html b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.html
index 59eb767e40..63f1250582 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.html
+++ b/client/src/app/site/pages/meetings/pages/agenda/modules/topics/pages/topic-detail/components/topic-detail/topic-detail.component.html
@@ -73,7 +73,7 @@ <h3>
                 </div>
             </ng-container>
 
-            <form *ngIf="editTopic && topicForm" [formGroup]="topicForm" (keydown)="onKeyDown($event)">
+            <form *ngIf="editTopic && topicForm" [formGroup]="topicForm" (keydown)="onKeyDown($event)" tabindex="-1">
                 <div>
                     <mat-form-field>
                         <mat-label>{{ 'Title' | translate }}</mat-label>
diff --git a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-info-dialog/agenda-item-info-dialog.component.html b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-info-dialog/agenda-item-info-dialog.component.html
index 1605ce7577..b4a57b4692 100644
--- a/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-info-dialog/agenda-item-info-dialog.component.html
+++ b/client/src/app/site/pages/meetings/pages/agenda/pages/agenda-item-list/components/agenda-item-info-dialog/agenda-item-info-dialog.component.html
@@ -1,6 +1,6 @@
 <h1 mat-dialog-title *ngIf="item">{{ 'Edit details for' | translate }} {{ item.getTitle() }}</h1>
 <mat-dialog-content>
-    <form class="item-dialog-form" [formGroup]="agendaInfoForm" (keydown)="onKeyDown($event)">
+    <form class="item-dialog-form" [formGroup]="agendaInfoForm" (keydown)="onKeyDown($event)" tabindex="-1">
         <!-- Tag -->
         <mat-form-field *ngIf="isTagAvailable()">
             <mat-label>{{ 'Tags' | translate }}</mat-label>
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-detail/category-detail.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-detail/category-detail.component.html
index 4cc9a9b9ce..990bcf2164 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-detail/category-detail.component.html
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-detail/category-detail.component.html
@@ -101,7 +101,7 @@ <h1 mat-dialog-title>
         <span>{{ 'Edit details for' | translate }} {{ selectedCategory.prefixedName }}</span>
     </h1>
     <mat-dialog-content class="os-form-card-mobile">
-        <form class="edit-form" [formGroup]="editForm" (ngSubmit)="save()" (keydown)="onKeyDown($event)">
+        <form class="edit-form" [formGroup]="editForm" (ngSubmit)="save()" (keydown)="onKeyDown($event)" tabindex="-1">
             <mat-form-field>
                 <mat-label>{{ 'Prefix' | translate }}</mat-label>
                 <input matInput osAutofocus formControlName="prefix" />
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-list/category-list.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-list/category-list.component.html
index 880322af9d..a89669605e 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-list/category-list.component.html
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-list/category-list.component.html
@@ -52,7 +52,7 @@ <h1 mat-dialog-title>
         <span>{{ 'New category' | translate }}</span>
     </h1>
     <mat-dialog-content class="os-form-card-mobile">
-        <form [formGroup]="createForm" (keydown)="onKeyDown($event)">
+        <form [formGroup]="createForm" (keydown)="onKeyDown($event)" tabindex="-1">
             <!-- Prefix -->
             <p>
                 <mat-form-field>
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-list/comment-section-list.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-list/comment-section-list.component.html
index 445d21dd39..a4bdedc059 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-list/comment-section-list.component.html
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/comments/components/comment-section-list/comment-section-list.component.html
@@ -103,7 +103,7 @@ <h1 mat-dialog-title>
         <span *ngIf="!currentComment">{{ 'New comment field' | translate }}</span>
     </h1>
     <mat-dialog-content class="os-form-card-mobile">
-        <form [formGroup]="commentFieldForm" (keydown)="onKeyDown($event)">
+        <form [formGroup]="commentFieldForm" (keydown)="onKeyDown($event)" tabindex="-1">
             <p>
                 <mat-form-field>
                     <mat-label>{{ 'Name' | translate }}</mat-label>
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/components/motion-block-create-dialog/motion-block-create-dialog.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/components/motion-block-create-dialog/motion-block-create-dialog.component.html
index f9f88705d9..eb8ddf953b 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/components/motion-block-create-dialog/motion-block-create-dialog.component.html
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-create-dialog/components/motion-block-create-dialog/motion-block-create-dialog.component.html
@@ -1,6 +1,6 @@
 <!-- Template for new motion block dialog -->
 <h1 mat-dialog-title>{{ 'New motion block' | translate }}</h1>
-<form [formGroup]="createBlockForm" (keydown)="onKeyDown($event)">
+<form [formGroup]="createBlockForm" (keydown)="onKeyDown($event)" tabindex="-1">
     <mat-dialog-content>
         <!-- Title -->
         <mat-form-field>
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/components/motion-block-edit-dialog/motion-block-edit-dialog.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/components/motion-block-edit-dialog/motion-block-edit-dialog.component.html
index d77377b695..c38d8f8bb6 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/components/motion-block-edit-dialog/motion-block-edit-dialog.component.html
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-blocks/components/motion-block-edit-dialog/components/motion-block-edit-dialog/motion-block-edit-dialog.component.html
@@ -1,6 +1,12 @@
 <h1 mat-dialog-title>{{ 'Edit details for' | translate }} {{ block.title }}</h1>
 <mat-dialog-content class="os-form-card-mobile">
-    <form class="edit-form" [formGroup]="blockEditForm" (ngSubmit)="saveBlock()" (keydown)="onKeyDown($event)">
+    <form
+        class="edit-form"
+        [formGroup]="blockEditForm"
+        (ngSubmit)="saveBlock()"
+        (keydown)="onKeyDown($event)"
+        tabindex="-1"
+    >
         <mat-form-field>
             <mat-label>{{ 'Title' | translate }}</mat-label>
             <input matInput osAutofocus formControlName="title" required />
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html
index 8329f73882..700f6174fa 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/amendment-create-wizard/amendment-create-wizard.component.html
@@ -47,6 +47,7 @@ <h2>{{ 'New amendment' | translate }}</h2>
                             class="paragraph-row background-hover"
                             [class.outlined-hover]="isParagraphSelected(paragraph)"
                             (click)="onParagraphClicked(paragraph)"
+                            tabindex="-1"
                         >
                             <mat-checkbox
                                 *ngIf="multipleParagraphsAllowed"
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-content/motion-content.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-content/motion-content.component.html
index 077f61406c..edefdcc806 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-content/motion-content.component.html
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-content/motion-content.component.html
@@ -37,7 +37,7 @@
     ></os-motion-detail-diff>
 </ng-container>
 
-<form class="motion-content" [formGroup]="contentForm" (keydown)="onKeyDown($event)">
+<form class="motion-content" [formGroup]="contentForm" (keydown)="onKeyDown($event)" tabindex="-1">
     <!-- Selecting statute paragraphs for amendment -->
     <div class="statute-amendment-selector" *ngIf="newMotion && statuteParagraphs.length && statutesEnabled">
         <mat-checkbox formControlName="statute_amendment" (change)="onStatuteAmendmentChange($event)">
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.html b/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.html
index bdb841d105..9eece1b80d 100644
--- a/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.html
+++ b/client/src/app/site/pages/meetings/pages/motions/pages/tags/components/tag-list/tag-list.component.html
@@ -45,7 +45,7 @@ <h1 mat-dialog-title>
         <span *ngIf="!currentTag">{{ 'New tag' | translate }}</span>
     </h1>
     <mat-dialog-content class="os-form-card-mobile">
-        <form [formGroup]="tagForm" (keydown)="onKeyDown($event)">
+        <form [formGroup]="tagForm" (keydown)="onKeyDown($event)" tabindex="-1">
             <mat-form-field>
                 <mat-label>{{ 'Name' | translate }}</mat-label>
                 <input required type="text" matInput formControlName="name" />