diff --git a/com.twin.app.shoptime/src/views/SearchPanel/SearchPanel.jsx b/com.twin.app.shoptime/src/views/SearchPanel/SearchPanel.jsx
index de7f0630..6c25b656 100644
--- a/com.twin.app.shoptime/src/views/SearchPanel/SearchPanel.jsx
+++ b/com.twin.app.shoptime/src/views/SearchPanel/SearchPanel.jsx
@@ -59,6 +59,7 @@ export default function SearchPanel({ panelInfo, isOnTop, spotlightId }) {
   );
   const { searchDatas: searchDatas } = useSelector((state) => state.search);
   const searchPerformed = useSelector((state) => state.search.searchPerformed);
+  const panels = useSelector((state) => state.panels.panels);
 
   const [currentPage, setCurrentPage] = useState(1);
   const [paginatedKeywords, setPaginatedKeywords] = useState([]);
@@ -67,7 +68,7 @@ export default function SearchPanel({ panelInfo, isOnTop, spotlightId }) {
     panelInfo.searchVal ? panelInfo.searchVal : null
   );
   const [position, setPosition] = useState(null);
-
+ 
   let searchQueryRef = usePrevious(searchQuery);
   let isOnTopRef = usePrevious(isOnTop);
 
@@ -240,7 +241,9 @@ export default function SearchPanel({ panelInfo, isOnTop, spotlightId }) {
           Spotlight.resume();
           setFirstSpot(true);
           if (panelInfo.currentSpot) {
-            Spotlight.focus(panelInfo.currentSpot);
+            if (panels[panels.length - 1]?.name === "searchpanel") {
+              Spotlight.focus(panelInfo.currentSpot);
+            }
           }
         }, 0);
       }