diff --git a/app/[locale]/layer-2/networks/page.tsx b/app/[locale]/layer-2/networks/page.tsx
index e2456436c82..95b03a22235 100644
--- a/app/[locale]/layer-2/networks/page.tsx
+++ b/app/[locale]/layer-2/networks/page.tsx
@@ -10,7 +10,7 @@ import type { ExtendedRollup, Lang, PageParams } from "@/lib/types"
 import CalloutSSR from "@/components/CalloutSSR"
 import { ContentHero, type ContentHeroProps } from "@/components/Hero"
 import I18nProvider from "@/components/I18nProvider"
-import Layer2NetworksTable from "@/components/Layer2NetworksTable/lazy"
+import Layer2NetworksTable from "@/components/Layer2NetworksTable"
 import MainArticle from "@/components/MainArticle"
 import NetworkMaturity from "@/components/NetworkMaturity"
 import { ButtonLink } from "@/components/ui/buttons/Button"
diff --git a/app/[locale]/wallets/find-wallet/page.tsx b/app/[locale]/wallets/find-wallet/page.tsx
index 30697df527c..36d48c53aee 100644
--- a/app/[locale]/wallets/find-wallet/page.tsx
+++ b/app/[locale]/wallets/find-wallet/page.tsx
@@ -8,7 +8,7 @@ import {
 import type { Lang, PageParams } from "@/lib/types"
 
 import Breadcrumbs from "@/components/Breadcrumbs"
-import FindWalletProductTable from "@/components/FindWalletProductTable/lazy"
+import FindWalletProductTable from "@/components/FindWalletProductTable"
 import I18nProvider from "@/components/I18nProvider"
 import MainArticle from "@/components/MainArticle"
 
diff --git a/src/components/FindWalletProductTable/List.tsx b/src/components/FindWalletProductTable/List.tsx
new file mode 100644
index 00000000000..8b72d890299
--- /dev/null
+++ b/src/components/FindWalletProductTable/List.tsx
@@ -0,0 +1,113 @@
+import { memo, useCallback, useRef, useState } from "react"
+
+import type { WalletRow } from "@/lib/types"
+
+import { cn } from "@/lib/utils/cn"
+import { trackCustomEvent } from "@/lib/utils/matomo"
+
+import WalletInfo from "./WalletInfo"
+
+type RowProps = {
+  wallet: WalletRow
+  index: number
+  open: boolean
+  visible: boolean
+  onOpenChange: (open: boolean, wallet: WalletRow) => void
+  children?: React.ReactNode
+}
+
+const Row = memo(function Row({
+  wallet,
+  index,
+  open,
+  visible,
+  onOpenChange,
+  children,
+}: RowProps) {
+  const handleToggle = useCallback(
+    (e: React.SyntheticEvent<HTMLDetailsElement>) => {
+      onOpenChange(e.currentTarget.open, wallet)
+    },
+    [onOpenChange, wallet]
+  )
+  return (
+    <details
+      data-index={index}
+      open={open}
+      onToggle={handleToggle}
+      className={cn(
+        "group/collapsible flex w-full flex-col border-b open:bg-background-highlight hover:bg-background-highlight",
+        !visible && "hidden"
+      )}
+    >
+      <summary className="cursor-pointer list-none p-4 focus-visible:outline focus-visible:-outline-offset-1 focus-visible:outline-primary-hover [&::-webkit-details-marker]:hidden">
+        <WalletInfo wallet={wallet} />
+      </summary>
+      {open && <div className="p-4">{children}</div>}
+    </details>
+  )
+})
+
+type ListProps = {
+  data: WalletRow[]
+  // Rows whose id is not in `matchedIds` are display:none. Avoids
+  // mount/unmount churn on filter changes.
+  matchedIds: Set<string>
+  renderSubComponent: (wallet: WalletRow, listIdx: number) => React.ReactNode
+  matomoEventCategory: string
+}
+
+const List = ({
+  data,
+  matchedIds,
+  renderSubComponent,
+  matomoEventCategory,
+  ...rest
+}: ListProps) => {
+  const [expanded, setExpanded] = useState<Record<string, boolean>>({})
+  const previousExpandedRef = useRef<Record<string, boolean>>({})
+
+  const handleOpenChange = useCallback(
+    (open: boolean, wallet: WalletRow) => {
+      setExpanded((prev) => ({ ...prev, [wallet.id]: open }))
+
+      if (!open) return
+
+      const expandedOnce = previousExpandedRef.current[wallet.id]
+      if (!expandedOnce) {
+        trackCustomEvent({
+          eventCategory: matomoEventCategory,
+          eventAction: "expanded",
+          eventName: wallet.id,
+        })
+      }
+      previousExpandedRef.current = {
+        ...previousExpandedRef.current,
+        [wallet.id]: true,
+      }
+    },
+    [matomoEventCategory]
+  )
+
+  return (
+    <div {...rest}>
+      {data.map((wallet, index) => {
+        const open = !!expanded[wallet.id]
+        return (
+          <Row
+            key={wallet.id}
+            wallet={wallet}
+            index={index}
+            open={open}
+            visible={matchedIds.has(wallet.id)}
+            onOpenChange={handleOpenChange}
+          >
+            {open && renderSubComponent(wallet, index)}
+          </Row>
+        )
+      })}
+    </div>
+  )
+}
+
+export default List
diff --git a/src/components/FindWalletProductTable/WalletInfo.tsx b/src/components/FindWalletProductTable/WalletInfo.tsx
index 5e00ac5f5c0..f7b84841fca 100644
--- a/src/components/FindWalletProductTable/WalletInfo.tsx
+++ b/src/components/FindWalletProductTable/WalletInfo.tsx
@@ -8,12 +8,10 @@ import { DevicesIcon, LanguagesIcon } from "@/components/icons/wallets"
 import { Image } from "@/components/Image"
 import { SupportedLanguagesTooltip } from "@/components/SupportedLanguagesTooltip"
 
-import { breakpointAsNumber } from "@/lib/utils/screen"
 import { formatStringList, getWalletPersonas } from "@/lib/utils/wallets"
 
 import { NUMBER_OF_SUPPORTED_LANGUAGES_SHOWN } from "@/lib/constants"
 
-import MediaQuery from "../MediaQuery"
 import { ButtonLink } from "../ui/buttons/Button"
 import { TagsInlineText } from "../ui/tag"
 
@@ -59,120 +57,79 @@ const WalletInfo = ({ wallet }: WalletInfoProps) => {
   }, [wallet.supportedLanguages])
 
   return (
-    <div className="flex flex-col gap-4">
+    <div className="relative flex flex-col gap-4">
+      {/* Open-state stripe (desktop only), sits in the image-column gutter. */}
+      <div
+        aria-hidden
+        className={`pointer-events-none absolute inset-s-7 top-16 -bottom-9 hidden w-1 -translate-x-1/2 lg:group-[[open]]/collapsible:block rtl:translate-x-1/2 ${wallet.twBackgroundColor}`}
+      />
+
       <div className="flex flex-row items-center justify-between gap-4">
-        <div className="flex flex-col gap-4">
-          {/* Desktop layout */}
-          <MediaQuery queries={[`(min-width: ${breakpointAsNumber.lg}px)`]}>
-            <div className="hidden flex-row gap-4 lg:flex">
-              <Image
-                src={wallet.image}
-                alt=""
-                style={{ objectFit: "contain", width: "56px", height: "56px" }}
-              />
-              <div className="flex flex-col gap-2">
-                <p className="text-xl font-bold">{wallet.name}</p>
-
-                <PersonaTags walletPersonas={walletPersonas} />
-
-                <div
-                  className={`ms-2 ${walletPersonas.length === 0 ? "mb-4" : ""} mt-1`}
-                >
-                  <ChainImages
-                    chains={wallet.supported_chains as ChainName[]}
-                    className={`ms-2 ${walletPersonas.length === 0 ? "mb-4" : ""}`}
-                  />
-                </div>
-              </div>
-            </div>
-          </MediaQuery>
-
-          {/* Mobile layout */}
-          <MediaQuery queries={[`(max-width: ${breakpointAsNumber.lg - 1}px)`]}>
-            <div className="flex flex-col gap-4 lg:hidden">
-              <div className="flex flex-row items-center gap-4">
-                <Image
-                  src={wallet.image}
-                  alt=""
-                  style={{
-                    objectFit: "contain",
-                    width: "24px",
-                    height: "24px",
-                  }}
-                />
-                <p className="text-xl font-bold">{wallet.name}</p>
-              </div>
-              <div>
-                <PersonaTags walletPersonas={walletPersonas} />
-              </div>
-              <ChainImages
-                chains={wallet.supported_chains as ChainName[]}
-                className={walletPersonas.length === 0 ? "mb-4" : ""}
-              />
+        <div className="grid flex-1 grid-cols-[auto_1fr] items-start gap-x-4 gap-y-2">
+          <Image
+            src={wallet.image}
+            alt=""
+            className="size-6 self-center object-contain lg:row-span-full lg:size-14 lg:self-start"
+          />
+
+          <p className="self-center text-xl font-bold lg:self-start">
+            {wallet.name}
+          </p>
+
+          {walletPersonas.length > 0 && (
+            <div className="col-span-2 lg:col-span-1 lg:col-start-2">
+              <PersonaTags walletPersonas={walletPersonas} />
             </div>
-          </MediaQuery>
+          )}
+
+          <div className="col-span-2 lg:col-span-1 lg:col-start-2">
+            <ChainImages chains={wallet.supported_chains as ChainName[]} />
+          </div>
 
-          <div className="flex flex-row gap-4">
-            <div className="relative hidden w-14 lg:block">
-              <div
-                className={`absolute -top-0 -bottom-9 left-1/2 hidden w-1 -translate-x-1/2 transform group-data-[state=open]/collapsible:block ${wallet.twBackgroundColor}`}
-              />
+          {deviceLabels.length > 0 && (
+            <div className="col-span-2 flex flex-row gap-2 lg:col-span-1 lg:col-start-2">
+              <DevicesIcon className="size-6" />
+              <TagsInlineText list={deviceLabels} />
             </div>
-            <div
-              className={`flex flex-col gap-2 ${walletPersonas.length === 0 ? "-mt-4" : ""}`}
-            >
-              {deviceLabels.length > 0 && (
-                <div className="flex flex-row gap-2">
-                  <DevicesIcon className="size-6" />
-                  <TagsInlineText list={deviceLabels} />
-                </div>
+          )}
+
+          <div className="col-span-2 flex flex-row gap-2 lg:col-span-1 lg:col-start-2">
+            <LanguagesIcon className="size-6" />
+            <p className="text-md">
+              {formattedLanguages}{" "}
+              {hasExtraLanguages && (
+                <SupportedLanguagesTooltip
+                  supportedLanguages={wallet.supportedLanguages}
+                />
               )}
-              <div className="flex flex-row gap-2">
-                <LanguagesIcon className="size-6" />
-                <p className="text-md">
-                  {formattedLanguages}{" "}
-                  {hasExtraLanguages && (
-                    <SupportedLanguagesTooltip
-                      supportedLanguages={wallet.supportedLanguages}
-                    />
-                  )}
-                </p>
-              </div>
-            </div>
+            </p>
           </div>
         </div>
-        <div>
-          <button className="text-primary">
-            <ChevronUp className="text-2xl group-data-[state=closed]/collapsible:hidden" />
-            <ChevronDown className="text-2xl group-data-[state=open]/collapsible:hidden" />
-          </button>
-        </div>
+
+        <span className="text-primary">
+          <ChevronUp className="text-2xl group-[&:not([open])]/collapsible:hidden" />
+          <ChevronDown className="text-2xl group-[[open]]/collapsible:hidden" />
+        </span>
       </div>
-      <div className="flex flex-row gap-4">
-        <div className="relative hidden w-14 lg:block">
-          <div
-            className={`absolute -top-0 -bottom-9 left-1/2 hidden w-1 -translate-x-1/2 transform group-data-[state=open]/collapsible:block ${wallet.twBackgroundColor}`}
-          />
-        </div>
-        <div className="flex flex-1">
-          <ButtonLink
-            href={wallet.url}
-            variant="outline"
-            className="p-2 max-sm:w-full"
-            size="sm"
-            customEventOptions={{
-              eventCategory: "WalletExternalLinkList",
-              eventAction: "Tap main button",
-              eventName: `${wallet.name}`,
-            }}
-            onClick={(e) => {
-              // Prevent expanding the wallet more info section when clicking on the "Visit website" button
-              e.stopPropagation()
-            }}
-          >
-            {t("page-find-wallet-visit-website")}
-          </ButtonLink>
-        </div>
+
+      <div className="lg:ps-18">
+        <ButtonLink
+          href={wallet.url}
+          variant="outline"
+          className="p-2 max-sm:w-full"
+          size="sm"
+          customEventOptions={{
+            eventCategory: "WalletExternalLinkList",
+            eventAction: "Tap main button",
+            eventName: `${wallet.name}`,
+          }}
+          onClick={(e) => {
+            // Prevent expanding the wallet more info section when clicking on the "Visit website" button
+            e.stopPropagation()
+          }}
+        >
+          {t("page-find-wallet-visit-website")}
+        </ButtonLink>
       </div>
     </div>
   )
diff --git a/src/components/FindWalletProductTable/WalletSubComponent.tsx b/src/components/FindWalletProductTable/WalletSubComponent.tsx
index ae66cdededc..138167386ed 100644
--- a/src/components/FindWalletProductTable/WalletSubComponent.tsx
+++ b/src/components/FindWalletProductTable/WalletSubComponent.tsx
@@ -15,7 +15,6 @@ import InlineLink from "@/components/ui/Link"
 
 import { cn } from "@/lib/utils/cn"
 import { getLocaleFormattedDate } from "@/lib/utils/date"
-import { trackCustomEvent } from "@/lib/utils/matomo"
 
 import { useTranslation } from "@/hooks/useTranslation"
 
@@ -55,12 +54,6 @@ const WalletSubComponent = ({
     wallet.last_updated
   )
 
-  trackCustomEvent({
-    eventCategory: "WalletMoreInfo",
-    eventAction: "More info wallet",
-    eventName: `More info ${wallet.name}`,
-  })
-
   return (
     <div className="flex flex-row gap-2">
       <div className="w-1 md:w-14">
diff --git a/src/components/FindWalletProductTable/index.tsx b/src/components/FindWalletProductTable/index.tsx
index 8ce175a8f5b..c32dfe2237a 100644
--- a/src/components/FindWalletProductTable/index.tsx
+++ b/src/components/FindWalletProductTable/index.tsx
@@ -9,9 +9,8 @@ import ProductTable from "@/components/ProductTable"
 import { trackCustomEvent } from "@/lib/utils/matomo"
 import { filterFn } from "@/lib/utils/wallets"
 
-import List from "../ProductTable/List"
-
 import FindWalletsNoResults from "./FindWalletsNoResults"
+import List from "./List"
 import WalletSubComponent from "./WalletSubComponent"
 
 import { useTranslation } from "@/hooks/useTranslation"
@@ -21,10 +20,6 @@ const FindWalletProductTable = ({ wallets }: { wallets: WalletRow[] }) => {
   const walletPersonas = useWalletPersonaPresets()
   const walletFilterOptions = useWalletFilters()
 
-  if (!Array.isArray(wallets)) {
-    return <div>Error loading wallets</div>
-  }
-
   return (
     <ProductTable<WalletRow>
       data={wallets}
@@ -33,18 +28,18 @@ const FindWalletProductTable = ({ wallets }: { wallets: WalletRow[] }) => {
       presetFilters={walletPersonas}
       mobileFiltersLabel={t("page-find-wallet-see-wallets")}
     >
-      {({ filteredData, filters, resetFilters }) => (
+      {({ data, matchedIds, filters, resetFilters }) => (
         <>
           <div className="sticky top-[76px] z-10 w-full border-b-background-highlight bg-background lg:border-b">
             <div className="flex w-full flex-row items-center justify-between border-none px-4 py-2">
               <p className="text-body-medium">
                 {t("page-find-wallet-showing-all-wallets")}{" "}
-                <span className="text-body">({filteredData.length})</span>
+                <span className="text-body">({matchedIds.size})</span>
               </p>
             </div>
           </div>
 
-          {filteredData.length === 0 && (
+          {matchedIds.size === 0 && (
             <FindWalletsNoResults
               resetFilters={() => {
                 resetFilters()
@@ -58,15 +53,15 @@ const FindWalletProductTable = ({ wallets }: { wallets: WalletRow[] }) => {
           )}
 
           <List
-            data={filteredData}
-            subComponent={(wallet, filters, listIdx) => (
+            data={data}
+            matchedIds={matchedIds}
+            renderSubComponent={(wallet, listIdx) => (
               <WalletSubComponent
                 wallet={wallet}
                 filters={filters}
                 listIdx={listIdx}
               />
             )}
-            filters={filters}
             matomoEventCategory="find-wallet"
             data-testid="wallet-list"
           />
diff --git a/src/components/FindWalletProductTable/lazy.tsx b/src/components/FindWalletProductTable/lazy.tsx
deleted file mode 100644
index e6750d95cf8..00000000000
--- a/src/components/FindWalletProductTable/lazy.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-"use client"
-
-import dynamic from "next/dynamic"
-
-import Loading from "./loading"
-
-export default dynamic(() => import("."), { ssr: false, loading: Loading })
diff --git a/src/components/FindWalletProductTable/loading.tsx b/src/components/FindWalletProductTable/loading.tsx
deleted file mode 100644
index 18c76ceb344..00000000000
--- a/src/components/FindWalletProductTable/loading.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { Skeleton, SkeletonLines } from "../ui/skeleton"
-
-const WalletSkeleton = () => (
-  <>
-    {Array.from({ length: 3 }).map((_, idx) => (
-      <div key={"wallet" + idx} className="flex w-full gap-4 border-b p-4">
-        <Skeleton className="size-16" />
-
-        <div className="flex flex-1 flex-col gap-2">
-          <Skeleton className="h-7 w-full max-w-32" />
-          <div className="flex gap-1">
-            <Skeleton className="h-5 w-20 rounded-full" />
-            <Skeleton className="h-5 w-20 rounded-full" />
-            <Skeleton className="h-5 w-20 rounded-full" />
-          </div>
-          <SkeletonLines noOfLines={4} className="pt-4" />
-          <div className="h-12 max-w-28 rounded border px-2 py-1.5">
-            <Skeleton className="h-full" />
-          </div>
-        </div>
-        <div className="flex items-center">
-          <Skeleton className="size-6" />
-        </div>
-      </div>
-    ))}
-  </>
-)
-
-const Loading = () => (
-  <div className="flex flex-col gap-16 px-4 lg:gap-20">
-    <div className="flex max-w-full gap-4 overflow-x-scroll lg:grid lg:grid-cols-5">
-      {Array.from({ length: 5 }).map((_, idx) => (
-        <Skeleton
-          key={"personas" + idx}
-          className="h-40 min-w-48 rounded-2xl shadow-svg-button-link xl:h-32"
-        />
-      ))}
-    </div>
-    <div className="flex flex-[3] flex-col gap-2 lg:hidden">
-      <div className="flex max-w-40 gap-2">
-        <div className="flex flex-1 flex-col gap-1">
-          <Skeleton className="w-full max-w-32" />
-          <Skeleton className="w-full max-w-24" />
-        </div>
-        <Skeleton className="size-8" />
-      </div>
-      <WalletSkeleton />
-    </div>
-    <div className="flex gap-6 max-lg:hidden">
-      <div className="flex max-w-80 flex-1 flex-col gap-2">
-        <div className="flex h-10 items-center justify-between px-6 py-1.5">
-          <Skeleton className="w-1/3" />
-          <div className="flex w-1/3 gap-1">
-            <Skeleton className="aspect-square" />
-            <Skeleton className="w-full" />
-          </div>
-        </div>
-        {Array.from({ length: 3 }).map((_, setIdx) => (
-          <div
-            key={"set" + setIdx}
-            className="flex w-full flex-col border px-6 py-2"
-          >
-            {Array.from({ length: 4 }).map((_, idx) => (
-              <div
-                key={"set" + setIdx + "option" + idx}
-                className="flex gap-2 border-b px-2 py-6 last:border-none"
-              >
-                <Skeleton className="aspect-square" />
-                <Skeleton className="w-1/3" />
-                <Skeleton className="ms-auto aspect-[2]" />
-              </div>
-            ))}
-          </div>
-        ))}
-      </div>
-      <div className="flex flex-1 flex-col gap-2">
-        <div className="flex gap-2">
-          <Skeleton className="w-full max-w-32" />
-          <Skeleton className="w-8" />
-        </div>
-        <WalletSkeleton />
-      </div>
-    </div>
-  </div>
-)
-
-export default Loading
diff --git a/src/components/Layer2NetworksTable/index.tsx b/src/components/Layer2NetworksTable/index.tsx
index 082b5f9d687..58426cd5415 100644
--- a/src/components/Layer2NetworksTable/index.tsx
+++ b/src/components/Layer2NetworksTable/index.tsx
@@ -1,3 +1,5 @@
+"use client"
+
 import { ExtendedRollup, FilterOption, Lang } from "@/lib/types"
 
 import { useNetworkColumns } from "@/components/Layer2NetworksTable/hooks/useNetworkColumns"
diff --git a/src/components/Layer2NetworksTable/lazy.tsx b/src/components/Layer2NetworksTable/lazy.tsx
deleted file mode 100644
index e6750d95cf8..00000000000
--- a/src/components/Layer2NetworksTable/lazy.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-"use client"
-
-import dynamic from "next/dynamic"
-
-import Loading from "./loading"
-
-export default dynamic(() => import("."), { ssr: false, loading: Loading })
diff --git a/src/components/Layer2NetworksTable/loading.tsx b/src/components/Layer2NetworksTable/loading.tsx
deleted file mode 100644
index b4ab7bcb276..00000000000
--- a/src/components/Layer2NetworksTable/loading.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import { Skeleton } from "../ui/skeleton"
-
-const NetworkRow = ({ idx }: { idx: number }) => (
-  <div
-    key={"network" + idx}
-    className="flex w-full items-center gap-4 border-b p-4"
-  >
-    <Skeleton className="size-10 rounded-full" />
-    <Skeleton className="h-6 w-40" />
-    <div className="ms-auto hidden gap-6 lg:flex">
-      <Skeleton className="h-6 w-20" />
-      <Skeleton className="h-6 w-20" />
-      <Skeleton className="h-6 w-28" />
-      <Skeleton className="size-6" />
-    </div>
-    <Skeleton className="ms-auto size-6 lg:hidden" />
-  </div>
-)
-
-const Loading = () => (
-  <div className="px-4">
-    <div className="flex flex-col gap-4 pt-4 pb-6 lg:flex-row lg:gap-6 2xl:px-0">
-      <div className="hidden w-80 flex-col gap-2 lg:flex">
-        <div className="flex items-center justify-between border-b px-2 py-1.5">
-          <Skeleton className="h-5 w-24" />
-          <Skeleton className="h-5 w-24" />
-        </div>
-        {Array.from({ length: 2 }).map((_, setIdx) => (
-          <div key={"set" + setIdx} className="flex flex-col border px-6 py-2">
-            {Array.from({ length: 4 }).map((_, idx) => (
-              <div
-                key={"set" + setIdx + "option" + idx}
-                className="flex items-center gap-2 border-b px-2 py-4 last:border-none"
-              >
-                <Skeleton className="aspect-square size-4" />
-                <Skeleton className="h-5 w-1/2" />
-              </div>
-            ))}
-          </div>
-        ))}
-      </div>
-      <div className="flex flex-1 flex-col">
-        <div className="flex items-center justify-between border-b px-4 py-2">
-          <Skeleton className="h-5 w-24 lg:hidden" />
-          <Skeleton className="h-5 w-40" />
-        </div>
-        {Array.from({ length: 6 }).map((_, idx) => (
-          <NetworkRow key={"network" + idx} idx={idx} />
-        ))}
-      </div>
-    </div>
-  </div>
-)
-
-export default Loading
diff --git a/src/components/ProductTable/List.tsx b/src/components/ProductTable/List.tsx
deleted file mode 100644
index 7b42aed2115..00000000000
--- a/src/components/ProductTable/List.tsx
+++ /dev/null
@@ -1,127 +0,0 @@
-import { useCallback, useLayoutEffect, useRef, useState } from "react"
-import { useWindowVirtualizer } from "@tanstack/react-virtual"
-
-import type { FilterOption, Wallet } from "@/lib/types"
-
-import { trackCustomEvent } from "@/lib/utils/matomo"
-
-import WalletInfo from "../FindWalletProductTable/WalletInfo"
-import {
-  Collapsible,
-  CollapsibleContent,
-  CollapsibleTrigger,
-} from "../ui/collapsible"
-
-type ListProps<T extends { id: string }> = {
-  data: T[]
-  subComponent?: (
-    item: T,
-    filters: FilterOption[],
-    listIdx: number
-  ) => React.ReactNode
-  matomoEventCategory: string
-  filters: FilterOption[]
-}
-
-const List = <T extends { id: string }>({
-  data,
-  subComponent,
-  matomoEventCategory,
-  filters,
-  ...rest
-}: ListProps<T>) => {
-  const [expanded, setExpanded] = useState<Record<string, boolean>>({})
-
-  const parentRef = useRef<HTMLDivElement>(null)
-  const parentOffsetRef = useRef(0)
-
-  const virtualizer = useWindowVirtualizer({
-    count: data.length,
-    estimateSize: () => 300,
-    overscan: 5,
-    scrollMargin: parentOffsetRef.current,
-  })
-
-  useLayoutEffect(() => {
-    parentOffsetRef.current = parentRef.current?.offsetTop ?? 0
-  }, [])
-
-  const previousExpandedRef = useRef<Record<string, boolean>>({})
-
-  const handleExpandedChange = useCallback(
-    (open: boolean, item: T) => {
-      // Disable scroll position adjustment during expansion or collapse
-      // ref https://github.com/TanStack/virtual/issues/562#issuecomment-2065858040
-      virtualizer.shouldAdjustScrollPositionOnItemSizeChange = () => false
-      setTimeout(() => {
-        virtualizer.shouldAdjustScrollPositionOnItemSizeChange = undefined
-      }, 0)
-
-      setExpanded((prev) => ({
-        ...prev,
-        [item.id]: open,
-      }))
-
-      if (!open) return
-
-      // the following code is used to track the first time a wallet is expanded
-      const expandedOnce = previousExpandedRef.current[item.id]
-
-      if (!expandedOnce) {
-        trackCustomEvent({
-          eventCategory: matomoEventCategory,
-          eventAction: "expanded",
-          eventName: item.id,
-        })
-      }
-
-      previousExpandedRef.current = {
-        ...previousExpandedRef.current,
-        [item.id]: true,
-      }
-    },
-    [matomoEventCategory, virtualizer]
-  )
-
-  return (
-    <div
-      ref={parentRef}
-      className="relative [overflow-anchor:none]"
-      style={{
-        height: `${virtualizer.getTotalSize()}px`,
-      }}
-      {...rest}
-    >
-      {virtualizer.getVirtualItems().map((virtualItem) => {
-        const item = data[virtualItem.index]
-
-        return (
-          <Collapsible
-            key={virtualItem.key}
-            data-index={virtualItem.index}
-            ref={virtualizer.measureElement}
-            // the virtualizer will re-render the item and reset the open state
-            // so we need to preserve the open state when the item is unmounted
-            open={!!expanded[item.id]}
-            onOpenChange={(open) => handleExpandedChange(open, item)}
-            className="group/collapsible absolute top-0 left-0 flex w-full cursor-pointer flex-col border-b hover:bg-background-highlight data-[state=open]:bg-background-highlight"
-            style={{
-              transform: `translateY(${virtualItem.start - virtualizer.options.scrollMargin}px)`,
-            }}
-          >
-            <CollapsibleTrigger asChild>
-              <div className="p-4">
-                <WalletInfo wallet={item as unknown as Wallet} />
-              </div>
-            </CollapsibleTrigger>
-            <CollapsibleContent className="p-4">
-              {subComponent?.(item as T, filters, virtualItem.index)}
-            </CollapsibleContent>
-          </Collapsible>
-        )
-      })}
-    </div>
-  )
-}
-
-export default List
diff --git a/src/components/ProductTable/index.tsx b/src/components/ProductTable/index.tsx
index 646ef832b5b..cd661e2fc8b 100644
--- a/src/components/ProductTable/index.tsx
+++ b/src/components/ProductTable/index.tsx
@@ -6,7 +6,6 @@ import {
   useMemo,
   useState,
 } from "react"
-import { useSearchParams } from "next/navigation"
 
 import type { FilterOption, TPresetFilters } from "@/lib/types"
 
@@ -14,10 +13,6 @@ import Filters from "@/components/ProductTable/Filters"
 import MobileFilters from "@/components/ProductTable/MobileFilters"
 import PresetFilters from "@/components/ProductTable/PresetFilters"
 
-import { breakpointAsNumber } from "@/lib/utils/screen"
-
-import MediaQuery from "../MediaQuery"
-
 import { getActiveFiltersCount, parseQueryParams } from "@/lib/product-table"
 
 interface ProductTableProps<T extends { id: string }> {
@@ -28,13 +23,17 @@ interface ProductTableProps<T extends { id: string }> {
   onResetFilters?: () => void
   mobileFiltersLabel: string
   children: ({
+    data,
     filteredData,
+    matchedIds,
     filters,
     setMobileFiltersOpen,
     resetFilters,
     activeFiltersCount,
   }: {
+    data: T[]
     filteredData: T[]
+    matchedIds: Set<string>
     filters: FilterOption[]
     setMobileFiltersOpen: (open: boolean) => void
     resetFilters: () => void
@@ -51,14 +50,17 @@ const ProductTable = <T extends { id: string }>({
   mobileFiltersLabel,
   children,
 }: ProductTableProps<T>) => {
-  const searchParams = useSearchParams()
-
   const [filters, setFilters] = useState<FilterOption[]>(initialFilters)
   const [mobileFiltersOpen, setMobileFiltersOpen] = useState(false)
 
-  // Update filters based on router query
+  // Hydrate filters from URL params once on mount. Reads window.location.search
+  // directly (not useSearchParams) to avoid Next's CSR bailout on this SSG page.
+  // Re-evaluate this when the page leaves SSG or gains a "share filtered URL"
+  // flow that pushes new params client-side.
   useEffect(() => {
-    const query = Object.fromEntries(searchParams?.entries() ?? [])
+    const query = Object.fromEntries(
+      new URLSearchParams(window.location.search).entries()
+    )
 
     if (Object.keys(query).length > 0) {
       const updatedFilters = filters.map((filter) => ({
@@ -75,12 +77,9 @@ const ProductTable = <T extends { id: string }>({
         })),
       }))
       setFilters(updatedFilters)
-
-      // TODO: Fix this, removed to avoid infinite re-renders
-      // router.replace(pathname, undefined, { shallow: true })
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [searchParams])
+  }, [])
 
   const updateFilters = useCallback(
     (filters: FilterOption | FilterOption[]) => {
@@ -113,6 +112,13 @@ const ProductTable = <T extends { id: string }>({
     return filterFn(data, filters)
   }, [data, filters, filterFn])
 
+  // Stable Set of currently-matching IDs. Consumers can render every row
+  // unconditionally and toggle visibility via this Set instead of mounting
+  // and unmounting subtrees on every filter change.
+  const matchedIds = useMemo(() => {
+    return new Set(filteredData.map((item) => item.id))
+  }, [filteredData])
+
   const presetFiltersCounts = useMemo(() => {
     return presetFilters.map((persona) => {
       const activeFilters = Object.entries(persona.presetFilters).filter(
@@ -155,19 +161,19 @@ const ProductTable = <T extends { id: string }>({
               mobileFiltersLabel={mobileFiltersLabel}
             />
           </div>
-          <MediaQuery queries={[`(min-width: ${breakpointAsNumber.lg}px)`]}>
-            <div className="hidden lg:block">
-              <Filters
-                filters={filters}
-                setFilters={updateFilters}
-                resetFilters={resetFilters}
-                activeFiltersCount={activeFiltersCount}
-              />
-            </div>
-          </MediaQuery>
+          <div className="hidden lg:block">
+            <Filters
+              filters={filters}
+              setFilters={updateFilters}
+              resetFilters={resetFilters}
+              activeFiltersCount={activeFiltersCount}
+            />
+          </div>
           <div className="flex-1">
             {children({
+              data,
               filteredData,
+              matchedIds,
               filters,
               setMobileFiltersOpen,
               resetFilters,
diff --git a/src/components/SupportedLanguagesTooltip/index.tsx b/src/components/SupportedLanguagesTooltip/index.tsx
index c47ee5149c4..0c4907d9478 100644
--- a/src/components/SupportedLanguagesTooltip/index.tsx
+++ b/src/components/SupportedLanguagesTooltip/index.tsx
@@ -8,7 +8,6 @@ type SupportedLanguagesTooltipProps = {
   supportedLanguages: string[]
 }
 
-// Tooltip to show other supported languages on a wallet
 export const SupportedLanguagesTooltip = ({
   supportedLanguages,
 }: SupportedLanguagesTooltipProps) => {
diff --git a/tests/e2e/pages/FindWalletPage.ts b/tests/e2e/pages/FindWalletPage.ts
index b17a2a5b1db..c501f8dccfb 100644
--- a/tests/e2e/pages/FindWalletPage.ts
+++ b/tests/e2e/pages/FindWalletPage.ts
@@ -30,7 +30,9 @@ export class FindWalletPage extends BasePage {
     this.mobileFiltersSubmitButton = page.getByTestId(
       "mobile-filters-submit-button"
     )
-    this.walletRows = page.getByTestId("wallet-list").locator(":scope > div")
+    this.walletRows = page
+      .getByTestId("wallet-list")
+      .locator(":scope > details")
     this.rowCounter = page.getByText(/Showing all wallets \(\d+\)/i)
   }