diff --git a/com.twin.app.shoptime/src/components/TabLayout/TabItem.jsx b/com.twin.app.shoptime/src/components/TabLayout/TabItem.jsx
index ffdeb89b..66f39dd6 100644
--- a/com.twin.app.shoptime/src/components/TabLayout/TabItem.jsx
+++ b/com.twin.app.shoptime/src/components/TabLayout/TabItem.jsx
@@ -57,9 +57,7 @@ const TabItemBase = ({
   const onKeyDown = useCallback(
     (event) => {
       if (event.key === "ArrowRight") {
-        if (!showSubTab) {
-          _onClick();
-        }
+        _onClick();
       }
     },
     [deActivateTab]
diff --git a/com.twin.app.shoptime/src/components/TabLayout/TabLayout.jsx b/com.twin.app.shoptime/src/components/TabLayout/TabLayout.jsx
index 0acc574d..5210b84d 100644
--- a/com.twin.app.shoptime/src/components/TabLayout/TabLayout.jsx
+++ b/com.twin.app.shoptime/src/components/TabLayout/TabLayout.jsx
@@ -375,8 +375,8 @@ export default function TabLayout({ topPanelName, onTabActivated }) {
 
   const handleNavigation = useCallback(
     ({ index, target }) => {
-      if (target && !showSubTab) {
-        console.log("#target", target);
+      if (target) {
+        setMainSelectedIndex(index);
         dispatch(resetPanels(target));
         deActivateTab();
         panelSwitching.current = true;