diff --git a/com.twin.app.shoptime/src/views/CategoryPanel/CategoryPanel.jsx b/com.twin.app.shoptime/src/views/CategoryPanel/CategoryPanel.jsx
index 9c16d8aa..77f06ac8 100644
--- a/com.twin.app.shoptime/src/views/CategoryPanel/CategoryPanel.jsx
+++ b/com.twin.app.shoptime/src/views/CategoryPanel/CategoryPanel.jsx
@@ -211,11 +211,14 @@ const CategoryPanel = ({ panelInfo, isOnTop, spotlightId }) => {
           SpotlightIds.CATEGORY_CONTENTS_BOX,
         ]);
         setTab(panelInfo.tab ? panelInfo.tab : INDEX_ITEM);
-        Spotlight.focus("tab-" + panelInfo.tab);
       } else if (panelInfo.currentSpot) {
         Spotlight.focus(panelInfo.currentSpot);
       }
+
       setTimeout(() => {
+        if (tab === INDEX_ITEM) {
+          Spotlight.focus(`[data-spotlight-id="${"tab-" + tab}"]`);
+        }
         Spotlight.focus(SpotlightIds.TBODY);
         if (panelInfo.currentSpot) {
           Spotlight.focus(panelInfo.currentSpot);
@@ -236,7 +239,7 @@ const CategoryPanel = ({ panelInfo, isOnTop, spotlightId }) => {
         ]);
       }
     }
-  }, [tab, categoryDatas]);
+  }, [tab, categoryDatas, panelInfo]);
 
   useEffect(() => {
     setContainerLastFocusedElement(null, [SpotlightIds.SHOW_PRODUCTS_BOX]);