diff --git a/src/popup/views/addressToken.js b/src/popup/views/addressToken.js
index 78b03c9..e2ddf96 100644
--- a/src/popup/views/addressToken.js
+++ b/src/popup/views/addressToken.js
@@ -45,6 +45,10 @@ function etherscanAddressLink(address) {
     return `https://etherscan.io/address/${address}`;
 }
 
+function etherscanTokenLink(tokenContract, holderAddress) {
+    return `https://etherscan.io/token/${tokenContract}?a=${holderAddress}`;
+}
+
 function isoDate(timestamp) {
     const d = new Date(timestamp * 1000);
     const pad = (n) => String(n).padStart(2, "0");
@@ -151,7 +155,10 @@ function show() {
     $("address-token-dot").innerHTML = addressDotHtml(addr.address);
     $("address-token-full").dataset.full = addr.address;
     $("address-token-full").textContent = addr.address;
-    const addrLink = etherscanAddressLink(addr.address);
+    const addrLink =
+        tokenId !== "ETH"
+            ? etherscanTokenLink(tokenId, addr.address)
+            : etherscanAddressLink(addr.address);
     $("address-token-etherscan-link").innerHTML =
         `<a href="${addrLink}" target="_blank" rel="noopener" class="inline-flex items-center">${EXT_ICON}</a>`;