diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/questionMark.html b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/questionMark.html
index 0ebd6098e9..a468e0635a 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/questionMark.html
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/af-commons/v1/fieldTemplates/questionMark.html
@@ -1,4 +1,4 @@
 <template data-sly-template.questionMark="${@ componentId, longDescription, bemBlock}">
-  <button class="${bemBlock}__questionmark" data-sly-test="${longDescription}" title="Help text">
+  <button class="${bemBlock}__questionmark" data-sly-test="${longDescription}" aria-expanded="false" title="Help text">
   </button>
 </template>
diff --git a/ui.frontend/src/view/FormFieldBase.js b/ui.frontend/src/view/FormFieldBase.js
index 876441501a..aedb60c36a 100644
--- a/ui.frontend/src/view/FormFieldBase.js
+++ b/ui.frontend/src/view/FormFieldBase.js
@@ -707,11 +707,13 @@ class FormFieldBase extends FormField {
                     if (tooltipAlwaysVisible) {
                         self.#showHideTooltipDiv(false);
                     }
+                    questionMarkDiv.setAttribute('aria-expanded', true);
                 } else {
                     self.#showHideLongDescriptionDiv(false);
                     if (tooltipAlwaysVisible) {
                         self.#showHideTooltipDiv(true);
                     }
+                    questionMarkDiv.setAttribute('aria-expanded', false);
                 }
             });
         }