diff --git a/src/frontend/src/pages/StorePage/index.tsx b/src/frontend/src/pages/StorePage/index.tsx
index 7e0d19d1d..304a025a0 100644
--- a/src/frontend/src/pages/StorePage/index.tsx
+++ b/src/frontend/src/pages/StorePage/index.tsx
@@ -49,6 +49,9 @@ export default function StorePage(): JSX.Element {
 
   useEffect(() => {
     handleGetComponents();
+    if (hasApiKey) {
+      getSavedComponents();
+    }
   }, [
     searchText,
     tabActive,
@@ -266,11 +269,11 @@ export default function StorePage(): JSX.Element {
 
             <div className="grid w-full gap-4 md:grid-cols-2 lg:grid-cols-3">
               {!loading || searchData.length !== 0 ? (
-                searchData.map((item, idx) => {
+                searchData.map((item) => {
                   return (
                     <>
                       <MarketCardComponent
-                        key={idx}
+                        key={item.id}
                         data={item}
                         authorized={!loadingSaved}
                         disabled={loading}