diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 6848285b8..7fd3a4231 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -7,6 +7,7 @@
     <div class="w-100 d-flex justify-content-center">
       <fieldset class="w-100" :aria-required=isRequired :class="getFieldSetClasses" :role="isMultiSelect ? 'group' : 'radiogroup'" :aria-labelledby="formattedGroupName">
         <legend class="sr-only" :data-focus-target="formattedGroupName" :id="formattedGroupName" tabindex="-1">
+          {{ questionText }}
           {{(isMultiSelect && answers && answers.length > 1) ? 'Select one or more options below.' : 'Select an option below.' }}
         </legend>
         <div :class="getComponentLoopWrapperClasses" role="application">
diff --git a/src/ux-components/list-button-horizontal/list-button-horizontal.vue b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
index 4c9670097..4e0def451 100644
--- a/src/ux-components/list-button-horizontal/list-button-horizontal.vue
+++ b/src/ux-components/list-button-horizontal/list-button-horizontal.vue
@@ -20,7 +20,7 @@
     <label
       tabindex="-1"
       :for="buttonID"
-      :aria-labelledby="buttonID"
+      :aria-label="buttonLabel"
       class="d-flex flex-column justify-content-center py-3 px-4"
       @mouseup="triggerButton()"
     >
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index aabb06ae5..80e8c6043 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -20,7 +20,7 @@
     <label
       tabindex="-1"
       :for="buttonID"
-      :aria-labelledby="buttonID"
+      :aria-label="buttonLabel"
       class="d-flex flex-column justify-content-center py-3 px-4"
       @mouseup="triggerButton"
     >
diff --git a/src/ux-components/list-card/list-card.vue b/src/ux-components/list-card/list-card.vue
index a1c95157f..38cc08703 100644
--- a/src/ux-components/list-card/list-card.vue
+++ b/src/ux-components/list-card/list-card.vue
@@ -26,7 +26,7 @@
       <label
         tabindex="-1"
         :for="buttonID"
-        :aria-labelledby="buttonID"
+        :aria-label="buttonLabel"
         class="d-flex w-100 align-items-center px-2 h-100"
         :class="getLabelClasses"
         @mouseup="triggerButton"