diff --git a/src/forms/BInputGroupFormInput.vue b/src/forms/BInputGroupFormInput.vue
index 885b61c4d..78ccb72f6 100644
--- a/src/forms/BInputGroupFormInput.vue
+++ b/src/forms/BInputGroupFormInput.vue
@@ -9,6 +9,13 @@
       <b-input-group-prepend v-if="icon"
         ><b-input-group-text><i :class="icon"></i></b-input-group-text
       ></b-input-group-prepend>
+      <span
+        v-if="tooltip"
+        :id="`${id}-tooltip`"
+        class="sr-only"
+      >
+        {{ tooltip }}
+      </span>
       <b-form-input
         :id="`${id}-input`"
         :type="type"
@@ -21,6 +28,7 @@
         :required="isRequired"
         :readonly="readonly"
         :disabled="isDisabled"
+        :aria-describedby="tooltip ? `${id}-tooltip` : null"
         v-on="inputListeners"
         v-on:blur="hadFocus = true"
         trim
diff --git a/src/forms/BInputGroupFormSelect.vue b/src/forms/BInputGroupFormSelect.vue
index e732ebb74..4fb82d87e 100644
--- a/src/forms/BInputGroupFormSelect.vue
+++ b/src/forms/BInputGroupFormSelect.vue
@@ -9,7 +9,13 @@
       <b-input-group-prepend v-if="icon"
         ><b-input-group-text><i :class="icon"></i></b-input-group-text
       ></b-input-group-prepend>
-
+      <span
+        v-if="tooltip"
+        :id="`${id}-tooltip`"
+        class="sr-only"
+      >
+        {{ tooltip }}
+      </span>
       <b-form-select
         :id="`${id}-input`"
         v-model="value"
@@ -19,6 +25,7 @@
         :required="isRequired"
         :state="feedbackState()"
         :class="inputClasses"
+        :aria-describedby="tooltip ? `${id}-tooltip` : null"
         v-on="inputListeners"
         v-on:blur="hadFocus = true"
       />