diff --git a/com.twin.app.shoptime/src/components/TButtonTab/TButtonTab.jsx b/com.twin.app.shoptime/src/components/TButtonTab/TButtonTab.jsx
index d520fce1..7f41d1da 100644
--- a/com.twin.app.shoptime/src/components/TButtonTab/TButtonTab.jsx
+++ b/com.twin.app.shoptime/src/components/TButtonTab/TButtonTab.jsx
@@ -39,6 +39,7 @@ export default function TButtonTab({
   colorType = COLOR_TYPE.white,
   spotlightId,
   onSpotlightLeft,
+  spotlightDisabled,
   scrollTop,
   ...rest
 }) {
@@ -98,6 +99,7 @@ export default function TButtonTab({
             onFocus={handleScrollReset}
             onBlur={handleStopScrolling}
             ariaLabel={ariaLabelText}
+            spotlightDisabled={spotlightDisabled}
           >
             {item}
           </TButtonTabItem>
diff --git a/com.twin.app.shoptime/src/views/CheckOutPanel/CheckOutPanel.jsx b/com.twin.app.shoptime/src/views/CheckOutPanel/CheckOutPanel.jsx
index 27793136..ab872c0f 100644
--- a/com.twin.app.shoptime/src/views/CheckOutPanel/CheckOutPanel.jsx
+++ b/com.twin.app.shoptime/src/views/CheckOutPanel/CheckOutPanel.jsx
@@ -238,7 +238,7 @@ export default function CheckOutPanel({ panelInfo }) {
 
         setCurrentTerms(selectedTerms);
         dispatch(setShowPopup(Config.ACTIVE_POPUP.termsPopup));
-
+        Spotlight.focus("spotlightId_TbuttonScrollerDown");
         const selectedIndex = empTermsData.findIndex(
           (term) => term.termsID === termsID
         );
@@ -362,6 +362,7 @@ export default function CheckOutPanel({ panelInfo }) {
                 selectedIndex={selectedTabIndex}
                 onItemClick={handleTabClick}
                 contents={tabList}
+                spotlightDisabled={true}
                 role="button"
               />
               <TButtonScroller