diff --git a/coral-base-list/src/scripts/BaseList.js b/coral-base-list/src/scripts/BaseList.js
index d8843e1d93..858c6fe2d1 100644
--- a/coral-base-list/src/scripts/BaseList.js
+++ b/coral-base-list/src/scripts/BaseList.js
@@ -218,6 +218,11 @@ const BaseList = (superClass) => class extends superClass {
   setIndex(element, value) {
     if (element instanceof HTMLElement) {
       element.setAttribute("tabindex", value);
+      const el = element.querySelectorAll("button:not([hidden])");
+      const buttonArray = Array.from(el).filter(item => item.offsetParent);
+      buttonArray.forEach(item => {
+        item.setAttribute("tabindex", value);
+      });
     }
   }