diff --git a/resources/assets/javascripts/lib/actionmenu.js b/resources/assets/javascripts/lib/actionmenu.js
index 7422ac8fe0f2895a5946224254a20aa7e1fff92d..0d1ca26fec40f31055c01108363fbfa8643338b5 100644
--- a/resources/assets/javascripts/lib/actionmenu.js
+++ b/resources/assets/javascripts/lib/actionmenu.js
@@ -197,7 +197,7 @@ class ActionMenu {
 
         this.menu.toggleClass('is-open', this.is_open);
         this.menu.toggleClass('is-reversed', this.is_reversed);
-        this.menu.attr('aria-expanded', this.is_open ? 'true' : 'false');
+        this.menu.find('.action-menu-icon').attr('aria-expanded', this.is_open ? 'true' : 'false');
     }
 
     /**
diff --git a/templates/shared/action-menu.php b/templates/shared/action-menu.php
index e07b6957e92944ef8e68d2f37d8d27b902f26c78..37ead278227d0b5117f20f810d07819b1bf28560 100644
--- a/templates/shared/action-menu.php
+++ b/templates/shared/action-menu.php
@@ -1,15 +1,15 @@
 <? // class "action-menu" will be set from API ?>
-<nav <?= arrayToHtmlAttributes($attributes) ?>>
-    <a class="action-menu-icon" title="<?= _('Aktionen') ?>" aria-expanded="false" aria-label="<?= _("Aktionsmenü") ?>" href="#">
+<nav <?= arrayToHtmlAttributes($attributes) ?> aria-role="presentation">
+    <a class="action-menu-icon" aria-expanded="false" title="<?= _('Aktionsmenü') ?>" href="#">
         <div></div>
         <div></div>
         <div></div>
     </a>
     <div class="action-menu-content">
-        <div class="action-menu-title">
+        <div class="action-menu-title" aria-hidden="true">
             <?= _('Aktionen') ?>
         </div>
-        <ul class="action-menu-list">
+        <ul class="action-menu-list" aria-label="<?= _('Aktionen') ?>">
         <? foreach ($actions as $action): ?>
             <li class="action-menu-item <? if (isset($action['attributes']['disabled'])) echo 'action-menu-item-disabled'; ?>">
             <? if ($action['type'] === 'link'): ?>