diff --git a/resources/assets/javascripts/bootstrap/actionmenu.js b/resources/assets/javascripts/bootstrap/actionmenu.js
index 8c6db2e2c1b4c50de45130c01af7e6f0183ec785..5cc6021404035999e7702965f95ad59be0fdaac7 100644
--- a/resources/assets/javascripts/bootstrap/actionmenu.js
+++ b/resources/assets/javascripts/bootstrap/actionmenu.js
@@ -42,7 +42,7 @@
             STUDIP.ActionMenu.closeAll();
         } else if (event.key === 'Tab') {
             //Check if the focus is inside an action menu:
-            let menu = $(event.target).closest('nav.action-menu');
+            let menu = $(event.target).closest('.action-menu');
             if (menu.hasClass('is-open') && STUDIP.ActionMenu.tabThroughItems(menu, event.shiftKey)) {
                 event.preventDefault();
             }
diff --git a/resources/assets/stylesheets/print.less b/resources/assets/stylesheets/print.less
index 46839712b4b712b5a6a27d0d3ef5ce2a2b298c71..4958fb9f25c52c40a4ebb3f8c1125d09c14df3ca 100644
--- a/resources/assets/stylesheets/print.less
+++ b/resources/assets/stylesheets/print.less
@@ -42,7 +42,7 @@ body, input, textarea, td, th, blockquote, p, form, ul, h4 {
 #schedule_icons, #edit_inst_entry, #sidebar, #top-bar,
 .messagebox_buttons a.close, a.button, button.button,
 #sidebar, .helpbar-container, .helpbar,
-#skip_link_navigation, .skip_target, nav.action-menu,
+#skip_link_navigation, .skip_target, .action-menu,
 #site-title {
     display: none !important;
 }
diff --git a/resources/vue/components/StudipActionMenu.vue b/resources/vue/components/StudipActionMenu.vue
index 99fced89fa9761c72b7dc283350ab62b30688cda..67f44a95736836421b557331ffaa32b61da639b9 100644
--- a/resources/vue/components/StudipActionMenu.vue
+++ b/resources/vue/components/StudipActionMenu.vue
@@ -1,5 +1,5 @@
 <template>
-    <nav v-if="shouldCollapse" class="action-menu">
+    <div v-if="shouldCollapse" class="action-menu">
         <button class="action-menu-icon" :title="title" aria-expanded="false">
             <span></span>
             <span></span>
@@ -30,12 +30,12 @@
                 </li>
             </ul>
         </div>
-    </nav>
-    <nav v-else>
+    </div>
+    <div v-else>
         <a v-for="item in navigationItems" :key="item.id" v-bind="linkAttributes(item)" v-on="linkEvents(item)">
             <studip-icon :title="item.label" :shape="item.icon.shape" :role="item.icon.role" :size="20"></studip-icon>
         </a>
-    </nav>
+    </div>
 </template>
 
 <script>
diff --git a/templates/shared/action-menu.php b/templates/shared/action-menu.php
index 938aa2c54202fa5c029ecf5a64957d5272803354..c781f3338596474fd14a50b270f4ec188954b235 100644
--- a/templates/shared/action-menu.php
+++ b/templates/shared/action-menu.php
@@ -12,8 +12,8 @@
  */
 ?>
 <? // class "action-menu" will be set from API ?>
-<nav <?= arrayToHtmlAttributes($attributes) ?> aria-role="presentation">
-    <button class="action-menu-icon" aria-role="button" aria-expanded="false" title="<?= htmlReady($action_menu_title) ?>">
+<div <?= arrayToHtmlAttributes($attributes) ?>>
+    <button class="action-menu-icon" aria-expanded="false" title="<?= htmlReady($action_menu_title) ?>">
         <span></span>
         <span></span>
         <span></span>
@@ -53,4 +53,4 @@
         <? endforeach ?>
         </ul>
     </div>
-</nav>
+</div>
diff --git a/templates/shared/contentgroup-row.php b/templates/shared/contentgroup-row.php
index 7dcc0fc8543ea9664bb7e65001db9f26f76d6c7e..eecb35de56c8f920d4eab65df3f9e6fdb6b3ff37 100644
--- a/templates/shared/contentgroup-row.php
+++ b/templates/shared/contentgroup-row.php
@@ -1,7 +1,7 @@
 <? // class "action-menu" will be set from API ?>
-<nav <?= arrayToHtmlAttributes($attributes) ?> aria-role="presentation">
+<nav <?= arrayToHtmlAttributes($attributes) ?>>
     <a class="action-menu-icon" title="<?= htmlReady($label) ?>"
-       aria-expanded="false" aria-label="<?= htmlReady($aria_label) ?>" aria-role="button" href="#"
+       aria-expanded="false" aria-label="<?= htmlReady($aria_label) ?>" role="button" href="#"
         <?= $image_link_attributes ? arrayToHtmlAttributes($image_link_attributes) : '' ?>>
         <?= $image ?>
     </a>