diff --git a/packages/nextjs/app/_components/ActiveGrants.tsx b/packages/nextjs/app/_components/ActiveGrants.tsx
index 83902f5..c704917 100644
--- a/packages/nextjs/app/_components/ActiveGrants.tsx
+++ b/packages/nextjs/app/_components/ActiveGrants.tsx
@@ -10,7 +10,7 @@ const ActiveGrantRow = ({ title, askAmount, builder, approvedAt }: GrantData) =>
       <td className="p-4 pl-4">{title}</td>
       <td className="p-4 pl-4">{askAmount} ETH</td>
       <td className="p-4 pl-4">
-        <Address address={builder} />
+        <Address address={builder} link={`https://app.buidlguidl.com/builders/${builder}`} />
       </td>
       <td className="p-4 pl-4">{approvedAt ? formatDateFromNow(approvedAt) : "-"}</td>
     </tr>
diff --git a/packages/nextjs/app/_components/CompletedGrants.tsx b/packages/nextjs/app/_components/CompletedGrants.tsx
index 9caa567..c961fe8 100644
--- a/packages/nextjs/app/_components/CompletedGrants.tsx
+++ b/packages/nextjs/app/_components/CompletedGrants.tsx
@@ -23,7 +23,7 @@ const CompletedGrantCard = ({ title, description, askAmount, builder, link, comp
         <p className="m-0 absolute bottom-4 left-4 text-lg">{title}</p>
       </div>
       <div className="flex flex-col gap-2 px-3">
-        <Address address={builder} />
+        <Address address={builder} link={`https://app.buidlguidl.com/builders/${builder}`} />
         <p className="text-base m-0 mt-2">
           <span className="font-medium">{askAmount} ETH</span>
         </p>
diff --git a/packages/nextjs/app/admin/_components/GrantReview.tsx b/packages/nextjs/app/admin/_components/GrantReview.tsx
index 13cab66..da31696 100644
--- a/packages/nextjs/app/admin/_components/GrantReview.tsx
+++ b/packages/nextjs/app/admin/_components/GrantReview.tsx
@@ -103,14 +103,7 @@ export const GrantReview = ({ grant }: { grant: GrantDataWithBuilder }) => {
         <span className="text-sm text-gray-500 ml-2">({grant.id})</span>
       </h3>
       <div className="flex gap-4 items-center">
-        <a
-          href={`https://app.buidlguidl.com/builders/${grant.builder}`}
-          className="inline-block"
-          target="_blank"
-          rel="noreferrer"
-        >
-          <Address address={grant.builder} disableAddressLink />
-        </a>
+        <Address address={grant.builder} link={`https://app.buidlguidl.com/builders/${grant.builder}`} />
         <BuilderSocials socialLinks={grant.builderData?.socialLinks} />
       </div>
       <p>{grant.description}</p>