diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 5fbe03ac6..4d4519c44 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -2,7 +2,7 @@
 <template>
   <div :class="isOverflowScrollable ? 'button-question button-question-overflow' : 'button-question'">
     <div v-if="questionText && answers && answers.length > 0" class="question-text d-flex">
-      <span class="fw-bold w-100">{{ questionText }}</span>
+      <span class="fw-bold w-100" tabindex="0">{{ questionText }}</span>
     </div>
     <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">
@@ -38,7 +38,7 @@
               :class="[suppressError ? 'alertError' : '']"
               :valueToLogType="valueToLogType"
             />
-            <!-- For nested questions --> 
+            <!-- For nested questions -->
             <transition name="fade" mode="out-in">
               <div v-if="typeof selectedValues == 'string' && selectedValues == answer.Name">
                 <slot></slot>
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index b9f46dffa..b82559812 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -16,6 +16,7 @@
       :aria-required="isRequired"
       v-model="checkValue"
       @change="handleInputChange"
+      :aria-label="value"
     >
     <label
       tabindex="-1"