diff --git a/src/components/lexicon-schema.tsx b/src/components/lexicon-schema.tsx
index b9638a1..d3c5959 100644
--- a/src/components/lexicon-schema.tsx
+++ b/src/components/lexicon-schema.tsx
@@ -1,7 +1,9 @@
 import { Nsid } from "@atcute/lexicons";
-import { useLocation, useNavigate } from "@solidjs/router";
+import { AtprotoDid } from "@atcute/lexicons/syntax";
+import { A, useLocation, useNavigate } from "@solidjs/router";
 import { createEffect, For, Show } from "solid-js";
 import { resolveLexiconAuthority } from "../utils/api.js";
+import Tooltip from "./tooltip.jsx";
 
 // Style constants
 const CONTAINER_CLASS =
@@ -689,7 +691,7 @@ const DefSection = (props: { name: string; def: LexiconDef }) => {
   );
 };
 
-export const LexiconSchemaView = (props: { schema: LexiconSchema }) => {
+export const LexiconSchemaView = (props: { schema: LexiconSchema; authority?: AtprotoDid }) => {
   const location = useLocation();
 
   // Handle scrolling to a definition when hash is like #schema:definitionName
@@ -708,7 +710,20 @@ export const LexiconSchemaView = (props: { schema: LexiconSchema }) => {
     <div class="w-full max-w-4xl px-2">
       {/* Header */}
       <div class="flex flex-col gap-2 border-b border-neutral-300 pb-3 dark:border-neutral-700">
-        <h2 class="text-lg font-semibold">{props.schema.id}</h2>
+        <div class="flex items-center gap-0.5">
+          <h2 class="text-lg font-semibold">{props.schema.id}</h2>
+          <Show when={props.authority}>
+            <Tooltip text="View record">
+              <A
+                href={`/at://${props.authority}/com.atproto.lexicon.schema/${props.schema.id}`}
+                class="flex items-center p-1.5 text-neutral-600 hover:text-neutral-900 dark:text-neutral-400 dark:hover:text-neutral-200"
+                target="_blank"
+              >
+                <span class="iconify lucide--external-link text-sm"></span>
+              </A>
+            </Tooltip>
+          </Show>
+        </div>
         <div class="flex gap-4 text-sm text-neutral-600 dark:text-neutral-400">
           <span>
             <span class="font-medium">Lexicon version: </span>
diff --git a/src/views/record.tsx b/src/views/record.tsx
index 20ce753..dfaa7c2 100644
--- a/src/views/record.tsx
+++ b/src/views/record.tsx
@@ -195,7 +195,7 @@ export const RecordView = () => {
   const [externalLink, setExternalLink] = createSignal<
     { label: string; link: string; icon?: string } | undefined
   >();
-  const [lexiconUri, setLexiconUri] = createSignal<string>();
+  const [lexiconAuthority, setLexiconAuthority] = createSignal<AtprotoDid>();
   const [validRecord, setValidRecord] = createSignal<boolean | undefined>(undefined);
   const [validSchema, setValidSchema] = createSignal<boolean | undefined>(undefined);
   const [schema, setSchema] = createSignal<ResolvedSchema>();
@@ -207,7 +207,6 @@ export const RecordView = () => {
   const fetchRecord = async () => {
     setValidRecord(undefined);
     setValidSchema(undefined);
-    setLexiconUri(undefined);
     const pds = await resolvePDS(did!);
     rpc = new Client({ handler: simpleFetchHandler({ service: pds }) });
     const res = await rpc.get("com.atproto.repo.getRecord", {
@@ -309,7 +308,7 @@ export const RecordView = () => {
   const resolveLexicon = async (nsid: Nsid) => {
     try {
       const authority = await resolveLexiconAuthority(nsid);
-      setLexiconUri(`at://${authority}/com.atproto.lexicon.schema/${nsid}`);
+      setLexiconAuthority(authority);
       if (params.collection !== "com.atproto.lexicon.schema") {
         const schema = await resolveLexiconSchema(authority, nsid);
         setSchema(schema);
@@ -487,7 +486,10 @@ export const RecordView = () => {
               </Show>
               <Show when={schema() || params.collection === "com.atproto.lexicon.schema"}>
                 <ErrorBoundary fallback={(err) => <div>Error: {err.message}</div>}>
-                  <LexiconSchemaView schema={schema()?.rawSchema ?? (record()?.value as any)} />
+                  <LexiconSchemaView
+                    schema={schema()?.rawSchema ?? (record()?.value as any)}
+                    authority={lexiconAuthority()}
+                  />
                 </ErrorBoundary>
               </Show>
             </Show>
@@ -565,19 +567,6 @@ export const RecordView = () => {
                     </Button>
                   </Show>
                 </div>
-                <Show when={lexiconUri()}>
-                  <div>
-                    <p class="font-semibold">Lexicon schema</p>
-                    <div class="truncate text-xs">
-                      <A
-                        href={`/${lexiconUri()}`}
-                        class="text-blue-500 hover:underline active:underline dark:text-blue-400"
-                      >
-                        {lexiconUri()}
-                      </A>
-                    </div>
-                  </div>
-                </Show>
               </div>
             </Show>
           </div>