diff --git a/modules/ui/src/app/components/download-report/download-report.component.html b/modules/ui/src/app/components/download-report/download-report.component.html
index d4ee224fe..839458ae8 100644
--- a/modules/ui/src/app/components/download-report/download-report.component.html
+++ b/modules/ui/src/app/components/download-report/download-report.component.html
@@ -18,6 +18,7 @@
class="download-report-link {{ getClass(data) }}"
[download]="getReportTitle(data)"
[href]="href"
+ [tabIndex]="tabindex"
target="_blank"
[matTooltip]="title">
diff --git a/modules/ui/src/app/components/download-report/download-report.component.ts b/modules/ui/src/app/components/download-report/download-report.component.ts
index 14d6c7659..3bdd7bc12 100644
--- a/modules/ui/src/app/components/download-report/download-report.component.ts
+++ b/modules/ui/src/app/components/download-report/download-report.component.ts
@@ -32,6 +32,7 @@ export class DownloadReportComponent extends ReportActionComponent {
@Input() href: string | undefined;
@Input() class!: string;
@Input() title!: string;
+ @Input() tabindex = 0;
getReportTitle(data: TestrunStatus) {
return `${data.device.manufacturer} ${data.device.model} ${
diff --git a/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.html b/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.html
index 5ef8e15fd..af94c4c74 100644
--- a/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.html
+++ b/modules/ui/src/app/components/download-zip-modal/download-zip-modal.component.html
@@ -117,6 +117,7 @@