diff --git a/app/(home-pages)/home/LeafletList/LeafletInfo.tsx b/app/(home-pages)/home/LeafletList/LeafletInfo.tsx
index b1c50611..53927749 100644
--- a/app/(home-pages)/home/LeafletList/LeafletInfo.tsx
+++ b/app/(home-pages)/home/LeafletList/LeafletInfo.tsx
@@ -32,17 +32,9 @@ export const LeafletInfo = (props: {
       className={`leafletInfo w-full min-w-0 flex flex-col ${props.className}`}
     >
       <div className="flex justify-between items-center shrink-0 max-w-full gap-2 leading-tight overflow-hidden">
-        <Link
-          onMouseEnter={() => setPrefetch(true)}
-          onPointerDown={() => setPrefetch(true)}
-          prefetch={prefetch}
-          href={`/${props.token.id}`}
-          className="no-underline sm:hover:no-underline text-primary grow min-w-0"
-        >
-          <h3 className="sm:text-lg text-base truncate w-full min-w-0">
-            {props.title}
-          </h3>
-        </Link>
+        <h3 className="sm:text-lg text-base truncate w-full min-w-0">
+          {props.title}
+        </h3>
         <div className="flex gap-1 shrink-0">
           {props.isTemplate && props.display === "list" ? (
             <TemplateSmall
@@ -60,28 +52,18 @@ export const LeafletInfo = (props: {
           />
         </div>
       </div>
-      <Link
-        onMouseEnter={() => setPrefetch(true)}
-        onPointerDown={() => setPrefetch(true)}
-        prefetch={prefetch}
-        href={`/${props.token.id}`}
-        className="no-underline sm:hover:no-underline text-primary w-full"
-      >
-        {props.draft || props.published ? (
-          <div
-            className={`text-xs ${props.published ? "font-bold text-tertiary" : "text-tertiary"}`}
-          >
-            {props.published
-              ? `Published ${prettyPublishedAt}`
-              : `Draft ${prettyCreatedAt}`}
-          </div>
-        ) : (
-          <div className="text-xs text-tertiary">{prettyCreatedAt}</div>
-        )}
-        {props.archived && (
-          <div className="text-xs text-tertiary">archived</div>
-        )}
-      </Link>
+      {props.draft || props.published ? (
+        <div
+          className={`text-xs ${props.published ? "font-bold text-tertiary" : "text-tertiary"}`}
+        >
+          {props.published
+            ? `Published ${prettyPublishedAt}`
+            : `Draft ${prettyCreatedAt}`}
+        </div>
+      ) : (
+        <div className="text-xs text-tertiary">{prettyCreatedAt}</div>
+      )}
+      {props.archived && <div className="text-xs text-tertiary">archived</div>}
       {props.isTemplate && props.display === "grid" ? (
         <div className="absolute -top-2 right-1">
           <TemplateSmall
diff --git a/app/(home-pages)/home/LeafletList/LeafletListItem.tsx b/app/(home-pages)/home/LeafletList/LeafletListItem.tsx
index 4a08db08..7fe37e7d 100644
--- a/app/(home-pages)/home/LeafletList/LeafletListItem.tsx
+++ b/app/(home-pages)/home/LeafletList/LeafletListItem.tsx
@@ -4,6 +4,7 @@ import { useTemplateState } from "../Actions/CreateNewButton";
 import { LeafletListPreview, LeafletGridPreview } from "./LeafletPreview";
 import { LeafletInfo } from "./LeafletInfo";
 import { useState, useRef, useEffect } from "react";
+import { SpeedyLink } from "components/SpeedyLink";
 
 export const LeafletListItem = (props: {
   token: PermissionToken;
@@ -50,22 +51,24 @@ export const LeafletListItem = (props: {
   if (props.display === "list")
     return (
       <>
-        <div
-          ref={previewRef}
-          className={`gap-3 w-full ${props.cardBorderHidden ? "" : "px-2 py-1 block-border hover:outline-border"}`}
-          style={{
-            backgroundColor: props.cardBorderHidden
-              ? "transparent"
-              : "rgba(var(--bg-page), var(--bg-page-alpha))",
+        <LeafletLink id={props.token.id}>
+          <div
+            ref={previewRef}
+            className={`gap-3 w-full ${props.cardBorderHidden ? "" : "px-2 py-1 block-border hover:outline-border relative"}`}
+            style={{
+              backgroundColor: props.cardBorderHidden
+                ? "transparent"
+                : "rgba(var(--bg-page), var(--bg-page-alpha))",
 
-            display: props.isHidden ? "none" : "flex",
-          }}
-        >
-          {props.showPreview && (
-            <LeafletListPreview isVisible={isOnScreen} {...props} />
-          )}
-          <LeafletInfo isTemplate={isTemplate} {...props} />
-        </div>
+              display: props.isHidden ? "none" : "flex",
+            }}
+          >
+            {props.showPreview && (
+              <LeafletListPreview isVisible={isOnScreen} {...props} />
+            )}
+            <LeafletInfo isTemplate={isTemplate} {...props} />
+          </div>
+        </LeafletLink>
         {props.cardBorderHidden && (
           <hr
             className="last:hidden border-border-light"
@@ -77,28 +80,41 @@ export const LeafletListItem = (props: {
       </>
     );
   return (
-    <div
-      ref={previewRef}
-      className={`leafletGridListItem relative
+    <LeafletLink id={props.token.id}>
+      <div
+        ref={previewRef}
+        className={`leafletGridListItem relative
         flex flex-col gap-1 p-1 h-52
        block-border border-border! hover:outline-border
         `}
-      style={{
-        backgroundColor: props.cardBorderHidden
-          ? "transparent"
-          : "rgba(var(--bg-page), var(--bg-page-alpha))",
+        style={{
+          backgroundColor: props.cardBorderHidden
+            ? "transparent"
+            : "rgba(var(--bg-page), var(--bg-page-alpha))",
 
-        display: props.isHidden ? "none" : "flex",
-      }}
-    >
-      <div className="grow">
-        <LeafletGridPreview {...props} isVisible={isOnScreen} />
+          display: props.isHidden ? "none" : "flex",
+        }}
+      >
+        <div className="grow">
+          <LeafletGridPreview {...props} isVisible={isOnScreen} />
+        </div>
+        <LeafletInfo
+          isTemplate={isTemplate}
+          className="px-1 pb-0.5 shrink-0"
+          {...props}
+        />
       </div>
-      <LeafletInfo
-        isTemplate={isTemplate}
-        className="px-1 pb-0.5 shrink-0"
-        {...props}
-      />
-    </div>
+    </LeafletLink>
+  );
+};
+
+const LeafletLink = (props: { id: string; children: React.ReactNode }) => {
+  return (
+    <SpeedyLink
+      href={`/${props.id}`}
+      className={`no-underline hover:no-underline! text-primary`}
+    >
+      {props.children}
+    </SpeedyLink>
   );
 };
diff --git a/app/(home-pages)/home/LeafletList/LeafletOptions.tsx b/app/(home-pages)/home/LeafletList/LeafletOptions.tsx
index 7d952704..da9953a5 100644
--- a/app/(home-pages)/home/LeafletList/LeafletOptions.tsx
+++ b/app/(home-pages)/home/LeafletList/LeafletOptions.tsx
@@ -48,7 +48,7 @@ export const LeafletOptions = (props: {
         }}
         trigger={
           <div
-            className="text-secondary shrink-0"
+            className="text-secondary shrink-0 relative"
             onClick={(e) => {
               e.preventDefault;
               e.stopPropagation;
diff --git a/app/(home-pages)/home/LeafletList/LeafletPreview.tsx b/app/(home-pages)/home/LeafletList/LeafletPreview.tsx
index bd8e10b4..0b92c225 100644
--- a/app/(home-pages)/home/LeafletList/LeafletPreview.tsx
+++ b/app/(home-pages)/home/LeafletList/LeafletPreview.tsx
@@ -8,13 +8,9 @@ import {
   useEntity,
   useReferenceToEntity,
 } from "src/replicache";
-import { useTemplateState } from "../Actions/CreateNewButton";
 import { useCardBorderHidden } from "components/Pages/useCardBorderHidden";
 import { LeafletContent } from "./LeafletContent";
 import { Tooltip } from "components/Tooltip";
-import { useState } from "react";
-import Link from "next/link";
-import { SpeedyLink } from "components/SpeedyLink";
 
 export const LeafletListPreview = (props: {
   draft?: boolean;
@@ -174,17 +170,7 @@ export const LeafletGridPreview = (props: {
             </div>
           </ThemeBackgroundProvider>
         </div>
-        <LeafletPreviewLink id={props.token.id} />
       </div>
     </ThemeProvider>
   );
 };
-
-const LeafletPreviewLink = (props: { id: string }) => {
-  return (
-    <SpeedyLink
-      href={`/${props.id}`}
-      className={`hello no-underline sm:hover:no-underline text-primary absolute inset-0 w-full h-full bg-bg-test`}
-    />
-  );
-};