diff --git a/modules/ui/src/app/components/version/consent-dialog/consent-dialog.component.html b/modules/ui/src/app/components/version/consent-dialog/consent-dialog.component.html
index 9c73c1885..8508045aa 100644
--- a/modules/ui/src/app/components/version/consent-dialog/consent-dialog.component.html
+++ b/modules/ui/src/app/components/version/consent-dialog/consent-dialog.component.html
@@ -16,7 +16,7 @@
 <section class="testrun-logo"></section>
 <section class="content-container">
   <section class="consent-main-content">
-    <h2>Welcome to Testrun!</h2>
+    <h2 tabindex="-1">Welcome to Testrun!</h2>
     <p>
       The application is ready to run the testing process for your devices. Here
       is a list of links you could find valuable:
diff --git a/modules/ui/src/app/components/version/version.component.ts b/modules/ui/src/app/components/version/version.component.ts
index debfd3dca..193ac52b6 100644
--- a/modules/ui/src/app/components/version/version.component.ts
+++ b/modules/ui/src/app/components/version/version.component.ts
@@ -106,10 +106,11 @@ export class VersionComponent implements OnInit, OnDestroy {
     const dialogRef = this.dialog.open(ConsentDialogComponent, {
       ariaLabel: 'Welcome to Testrun modal window',
       data: dialogData,
-      autoFocus: true,
+      autoFocus: 'first-heading',
       hasBackdrop: true,
       disableClose: true,
       panelClass: 'consent-dialog',
+      ariaModal: true,
     });
 
     dialogRef