diff --git a/src/utils/api.ts b/src/utils/api.ts
index 4e7eec4..8f20319 100644
--- a/src/utils/api.ts
+++ b/src/utils/api.ts
@@ -215,6 +215,32 @@ const getRecordBacklinks = (
 ): Promise<LinksWithRecords> =>
   getConstellation("/links", target, collection, path, cursor, limit || 100);
 
+export interface HandleResolveResult {
+  success: boolean;
+  did?: string;
+  error?: string;
+}
+
+export const resolveHandleDetailed = async (handle: Handle) => {
+  const dnsResolver = new DohJsonHandleResolver({ dohUrl: "https://dns.google/resolve?" });
+  const httpResolver = new WellKnownHandleResolver();
+
+  const tryResolve = async (
+    resolver: DohJsonHandleResolver | WellKnownHandleResolver,
+  ): Promise<HandleResolveResult> => {
+    try {
+      const did = await resolver.resolve(handle);
+      return { success: true, did };
+    } catch (err: any) {
+      return { success: false, error: err.message ?? String(err) };
+    }
+  };
+
+  const [dns, http] = await Promise.all([tryResolve(dnsResolver), tryResolve(httpResolver)]);
+
+  return { dns, http };
+};
+
 export {
   didDocCache,
   getAllBacklinks,
diff --git a/src/views/repo.tsx b/src/views/repo.tsx
index fa2628e..60ad7b1 100644
--- a/src/views/repo.tsx
+++ b/src/views/repo.tsx
@@ -23,17 +23,19 @@ import {
   NavMenu,
 } from "../components/dropdown.jsx";
 import { Favicon } from "../components/favicon.jsx";
+import { Modal } from "../components/modal.jsx";
 import {
   addNotification,
   removeNotification,
   updateNotification,
 } from "../components/notification.jsx";
-import Tooltip from "../components/tooltip.jsx";
 import { isTouchDevice } from "../layout.jsx";
 import {
   didDocCache,
+  type HandleResolveResult,
   labelerCache,
   resolveHandle,
+  resolveHandleDetailed,
   resolveLexiconAuthority,
   resolvePDS,
   validateHandle,
@@ -54,6 +56,11 @@ export const RepoView = () => {
   const [filter, setFilter] = createSignal<string>();
   const [validHandles, setValidHandles] = createStore<Record<string, boolean>>({});
   const [rotationKeys, setRotationKeys] = createSignal<Array<string>>([]);
+  const [handleModalAlias, setHandleModalAlias] = createSignal<string | null>(null);
+  const [handleDetailedResult, setHandleDetailedResult] = createSignal<{
+    dns: HandleResolveResult;
+    http: HandleResolveResult;
+  } | null>(null);
   let rpc: Client;
   let pds: string;
   const did = params.repo!;
@@ -502,17 +509,20 @@ export const RepoView = () => {
                             <div class="flex items-center gap-1 text-sm text-neutral-700 dark:text-neutral-300">
                               <span>{alias}</span>
                               <Show when={alias.startsWith("at://")}>
-                                <Tooltip
-                                  text={
-                                    validHandles[alias] === true ? "Valid handle"
-                                    : validHandles[alias] === undefined ?
-                                      "Validating"
-                                    : "Invalid handle"
-                                  }
+                                <button
+                                  class="flex items-center rounded p-0.5 hover:bg-neutral-200 dark:hover:bg-neutral-700"
+                                  onClick={async () => {
+                                    setHandleDetailedResult(null);
+                                    setHandleModalAlias(alias);
+                                    const handle = alias.replace("at://", "") as Handle;
+                                    const result = await resolveHandleDetailed(handle);
+                                    if (handleModalAlias() === alias)
+                                      setHandleDetailedResult(result);
+                                  }}
                                 >
                                   <span
                                     classList={{
-                                      "iconify lucide--check text-green-600 dark:text-green-400":
+                                      "iconify text-base lucide--check text-green-600 dark:text-green-400":
                                         validHandles[alias] === true,
                                       "iconify lucide--x text-red-500 dark:text-red-400":
                                         validHandles[alias] === false,
@@ -520,7 +530,7 @@ export const RepoView = () => {
                                         validHandles[alias] === undefined,
                                     }}
                                   ></span>
-                                </Tooltip>
+                                </button>
                               </Show>
                             </div>
                           )}
@@ -528,6 +538,108 @@ export const RepoView = () => {
                       </div>
                     </Show>
 
+                    {/* Handle Verification Modal */}
+                    <Modal
+                      open={handleModalAlias() !== null}
+                      onClose={() => setHandleModalAlias(null)}
+                      contentClass="dark:bg-dark-300 dark:shadow-dark-700 pointer-events-auto w-max max-w-[90vw] rounded-lg border-[0.5px] border-neutral-300 bg-white p-4 shadow-md sm:max-w-xl dark:border-neutral-700"
+                    >
+                      <div class="mb-2 flex items-center justify-between gap-4">
+                        <p class="truncate font-semibold">
+                          {handleModalAlias()?.replace("at://", "")}
+                        </p>
+                        <button
+                          onclick={() => setHandleModalAlias(null)}
+                          class="flex shrink-0 items-center rounded-md p-1.5 text-neutral-500 hover:bg-neutral-100 hover:text-neutral-700 active:bg-neutral-200 dark:text-neutral-400 dark:hover:bg-neutral-700 dark:hover:text-neutral-200 dark:active:bg-neutral-600"
+                        >
+                          <span class="iconify lucide--x"></span>
+                        </button>
+                      </div>
+                      <div class="flex flex-col gap-2">
+                        <Show
+                          when={handleDetailedResult()}
+                          fallback={
+                            <div class="flex items-center gap-2 py-2">
+                              <span class="iconify lucide--loader-circle animate-spin"></span>
+                              <span>Resolving handle...</span>
+                            </div>
+                          }
+                        >
+                          {(result) => {
+                            const expectedDid = didDocument().id;
+                            const dnsOk = () =>
+                              result().dns.success && result().dns.did === expectedDid;
+                            const httpOk = () =>
+                              result().http.success && result().http.did === expectedDid;
+                            const dnsMismatch = () =>
+                              result().dns.success && result().dns.did !== expectedDid;
+                            const httpMismatch = () =>
+                              result().http.success && result().http.did !== expectedDid;
+
+                            return (
+                              <div class="grid grid-cols-[auto_1fr] items-center gap-x-1.5">
+                                {/* DNS Result */}
+                                <span
+                                  classList={{
+                                    "iconify lucide--check text-green-600 dark:text-green-400":
+                                      dnsOk(),
+                                    "iconify lucide--x text-red-500 dark:text-red-400": !dnsOk(),
+                                  }}
+                                ></span>
+                                <span class="font-medium">DNS (TXT record)</span>
+                                <span></span>
+                                <div class="mb-2 text-sm wrap-anywhere text-neutral-500 dark:text-neutral-400">
+                                  <Show
+                                    when={result().dns.success}
+                                    fallback={
+                                      <div class="text-red-500 dark:text-red-400">
+                                        {result().dns.error}
+                                      </div>
+                                    }
+                                  >
+                                    <div>{result().dns.did}</div>
+                                    <Show when={dnsMismatch()}>
+                                      <div class="text-red-500 dark:text-red-400">
+                                        Expected: {expectedDid}
+                                      </div>
+                                    </Show>
+                                  </Show>
+                                </div>
+
+                                {/* HTTP Result */}
+                                <span
+                                  classList={{
+                                    "iconify lucide--check text-green-600 dark:text-green-400":
+                                      httpOk(),
+                                    "iconify lucide--x text-red-500 dark:text-red-400": !httpOk(),
+                                  }}
+                                ></span>
+                                <span class="font-medium">HTTP (.well-known)</span>
+                                <span></span>
+                                <div class="text-sm wrap-anywhere text-neutral-500 dark:text-neutral-400">
+                                  <Show
+                                    when={result().http.success}
+                                    fallback={
+                                      <div class="text-red-500 dark:text-red-400">
+                                        {result().http.error}
+                                      </div>
+                                    }
+                                  >
+                                    <div>{result().http.did}</div>
+                                    <Show when={httpMismatch()}>
+                                      <div class="text-red-500 dark:text-red-400">
+                                        Expected: {expectedDid}
+                                      </div>
+                                    </Show>
+                                  </Show>
+                                </div>
+                              </div>
+                            );
+                          }}
+                        </Show>
+                      </div>
+                    </Modal>
+
                     {/* Services Section */}
                     <Show when={didDocument().service}>
                       <div>