diff --git a/modules/ui/src/app/app.component.html b/modules/ui/src/app/app.component.html
index d2969a096..a89ee0b51 100644
--- a/modules/ui/src/app/app.component.html
+++ b/modules/ui/src/app/app.component.html
@@ -177,6 +177,7 @@ <h1 class="main-heading">Testrun</h1>
     #settingsDrawer
     mode="over"
     position="end"
+    autoFocus="#setting-panel-close-button"
     class="settings-drawer">
     <app-general-settings
       #settings
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 bc8252909..da81a512c 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
@@ -89,7 +89,7 @@ <h2>Welcome to Testrun!</h2>
         href="https://policies.google.com/technologies/partner-sites"
         target="_blank"
         class="message-link"
-        aria-label="Terms of service here"
+        aria-label="here on Google Privacy & Terms page"
         >here</a
       >.
     </app-callout>
diff --git a/modules/ui/src/app/pages/settings/general-settings.component.html b/modules/ui/src/app/pages/settings/general-settings.component.html
index 1cecc2bbd..2e77950a6 100644
--- a/modules/ui/src/app/pages/settings/general-settings.component.html
+++ b/modules/ui/src/app/pages/settings/general-settings.component.html
@@ -18,6 +18,7 @@ <h2 class="settings-drawer-header-title">System settings</h2>
   <button
     (click)="closeSetting(EventType.Close)"
     aria-label="close"
+    id="setting-panel-close-button"
     class="settings-drawer-header-button"
     mat-button>
     <mat-icon class="close-button-icon" svgIcon="close"></mat-icon>