diff --git a/templates/header.php b/templates/header.php
index be445e73ea25927eec20cff5cd931055a9365fff..c8aeb1cacd91a558319687d0afe92a5fa107f585 100644
--- a/templates/header.php
+++ b/templates/header.php
@@ -50,10 +50,6 @@ if ($navigation) {
 }
 
 ?>
-<div id="skip_link_navigation" aria-busy="true"></div>
-<? SkipLinks::addIndex(_('Hauptinhalt'), 'content', 100) ?>
-<?= PageLayout::getBodyElements() ?>
-
 <!-- Begin main site header -->
 <header id="main-header">
 
diff --git a/templates/layouts/base.php b/templates/layouts/base.php
index ddf8b1b4da71d62b43b903676a3b40828859f9ba..29a8cd9fe0a69f890ca1efb9f1aba70808f7be92 100644
--- a/templates/layouts/base.php
+++ b/templates/layouts/base.php
@@ -70,9 +70,9 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']);
 </script>
 </head>
 
-<body id="<?= PageLayout::getBodyElementId() ?>" class="enable-skiplinks">
+<body id="<?= PageLayout::getBodyElementId() ?>">
     <div id="skip_link_navigation" aria-busy="true"></div>
-    <? SkipLinks::addIndex(_('Hauptinhalt'), 'content', 100) ?>
+    <?= PageLayout::getBodyElements() ?>
 
     <? include 'lib/include/header.php' ?>
 
@@ -80,6 +80,7 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']);
 
     <!-- Start main page content -->
     <main id="content-wrapper">
+        <? SkipLinks::addIndex(_('Hauptinhalt'), 'content', 100) ?>
         <div id="content">
             <h1 class="sr-only"><?= htmlReady(PageLayout::getTitle()) ?></h1>
             <? if (PageLayout::isFullscreenModeAllowed()): ?>