diff --git a/application/views/scripts/config/authentication/reorder.phtml b/application/views/scripts/config/authentication/reorder.phtml
index e2491c1fc..daa8a959f 100644
--- a/application/views/scripts/config/authentication/reorder.phtml
+++ b/application/views/scripts/config/authentication/reorder.phtml
@@ -6,7 +6,7 @@
     <?= $this->translate('Authentication Configuration'); ?>
   </h1>
   <div class="skip-links skip-links-inline">
-    <h3 class="sr-only"><?= $this->translate('Skip Links'); ?></h3>
+    <h2 class="sr-only"><?= $this->translate('Skip Links'); ?></h2>
     <ul>
       <li>
         <a tabindex="0" href="#authentication-reorder-form">
diff --git a/application/views/scripts/config/resource.phtml b/application/views/scripts/config/resource.phtml
index 013dfed19..4cfbcc4d2 100644
--- a/application/views/scripts/config/resource.phtml
+++ b/application/views/scripts/config/resource.phtml
@@ -2,21 +2,20 @@
   <?= $tabs; ?>
 </div>
 <div class="content" data-base-target="_next">
-  <h1 tabindex="0" id="resource-index">
+  <h1 tabindex="-1" id="resource-index">
     <?= t('Resource Configuration'); ?>
   </h1>
   <div class="skip-links skip-links-inline">
-    <nav>
-      <ul>
-        <li>
-          <a tabindex="0" href="#resource-edit-table">
-            <?= t('Skip To Existing Resources'); ?>
-          </a>
-        </li>
-      </ul>
-    </nav>
+    <h2 class="sr-only"><?= $this->translate('Skip Links'); ?></h2>
+    <ul>
+      <li>
+        <a tabindex="0" href="#resource-edit-table">
+          <?= t('Skip To Existing Resources'); ?>
+        </a>
+      </li>
+    </ul>
   </div>
-  <h2 tabindex="0" id="resource-new-resource" class="sr-only">
+  <h2 tabindex="-1" id="resource-new-resource" class="sr-only">
     <?= t('Create New Resource'); ?>
   </h2>
   <p>
@@ -24,7 +23,7 @@
       <?= $this->icon('plus', null, array('aria-hidden' => 'true')); ?> <?= $this->translate('Create A New Resource'); ?>
     </a>
   </p>
-  <h2 tabindex="0" id="resource-edit-resource" class="sr-only">
+  <h2 tabindex="-1" id="resource-edit-resource" class="sr-only">
     <?= t('Edit Existing Resources'); ?>
   </h2>
   <table class="action" id="resource-edit-table">
diff --git a/application/views/scripts/config/resource/create.phtml b/application/views/scripts/config/resource/create.phtml
index c70bd4779..71d8c946e 100644
--- a/application/views/scripts/config/resource/create.phtml
+++ b/application/views/scripts/config/resource/create.phtml
@@ -2,7 +2,7 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="0" id="resource-create">
+    <h1 tabindex="-1" id="resource-create">
         <?= $this->translate('Create A New Resource'); ?>
     </h1>
     <p><?= $this->translate('Resources are entities that provide data to Icinga Web 2.'); ?></p>
diff --git a/application/views/scripts/config/resource/modify.phtml b/application/views/scripts/config/resource/modify.phtml
index 48255261b..b7bd0a2f7 100644
--- a/application/views/scripts/config/resource/modify.phtml
+++ b/application/views/scripts/config/resource/modify.phtml
@@ -2,7 +2,7 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="0" id="resource-edit">
+    <h1 tabindex="-1" id="resource-edit">
         <?= $this->translate('Edit Existing Resource'); ?>
     </h1>
     <div>
diff --git a/application/views/scripts/config/resource/remove.phtml b/application/views/scripts/config/resource/remove.phtml
index ad5ed59cb..010f2d5d2 100644
--- a/application/views/scripts/config/resource/remove.phtml
+++ b/application/views/scripts/config/resource/remove.phtml
@@ -2,7 +2,7 @@
     <?= $this->tabs->showOnlyCloseButton() ?>
 </div>
 <div class="content">
-    <h1 tabindex="0" id="resource-remove">
+    <h1 tabindex="-1" id="resource-remove">
         <?= $this->translate('Remove Existing Resource'); ?>
     </h1>
     <div>