diff --git a/client/src/app/core/ui-services/projection-dialog.service.ts b/client/src/app/core/ui-services/projection-dialog.service.ts
index 0f44623c7..5e26b3863 100644
--- a/client/src/app/core/ui-services/projection-dialog.service.ts
+++ b/client/src/app/core/ui-services/projection-dialog.service.ts
@@ -42,6 +42,7 @@ export class ProjectionDialogService {
             ProjectionDialogReturnType
         >(ProjectionDialogComponent, {
             maxHeight: '90vh',
+            autoFocus: false,
             data: descriptor
         });
         const response = await dialogRef.afterClosed().toPromise();
diff --git a/client/src/app/shared/components/projection-dialog/projection-dialog.component.html b/client/src/app/shared/components/projection-dialog/projection-dialog.component.html
index 404879cf7..c648005af 100644
--- a/client/src/app/shared/components/projection-dialog/projection-dialog.component.html
+++ b/client/src/app/shared/components/projection-dialog/projection-dialog.component.html
@@ -38,6 +38,6 @@
     </div>
 </mat-dialog-content>
 <mat-dialog-actions>
-    <button mat-button (click)="onOk()" color="primary" translate>OK</button>
+    <button mat-button osAutofocus (click)="onOk()" color="primary" translate>OK</button>
     <button mat-button (click)="onCancel()" translate>Cancel</button>
 </mat-dialog-actions>