diff --git a/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx b/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
index 20d4a5990..b7243f529 100644
--- a/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
+++ b/ui/v2.5/src/components/Tagger/scenes/StudioModal.tsx
@@ -7,19 +7,16 @@ import * as GQL from "src/core/generated-graphql";
 import { useFindStudio } from "src/core/StashService";
 import { Icon } from "src/components/Shared/Icon";
 import { ModalComponent } from "src/components/Shared/Modal";
-import {
-  faCheck,
-  faExternalLinkAlt,
-  faTimes,
-} from "@fortawesome/free-solid-svg-icons";
+import { faCheck, faTimes } from "@fortawesome/free-solid-svg-icons";
 import { Button, Form } from "react-bootstrap";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { excludeFields } from "src/utils/data";
 import { ExternalLink } from "src/components/Shared/ExternalLink";
+import { StashIDPill } from "src/components/Shared/StashID";
 
 interface IStudioDetailsProps {
   studio: GQL.ScrapedSceneStudioDataFragment;
-  link?: string;
+  endpoint?: string;
   excluded: Record<string, boolean>;
   toggleField: (field: string) => void;
   isNew?: boolean;
@@ -27,7 +24,7 @@ interface IStudioDetailsProps {
 
 const StudioDetails: React.FC<IStudioDetailsProps> = ({
   studio,
-  link,
+  endpoint,
   excluded,
   toggleField,
   isNew = false,
@@ -123,15 +120,14 @@ const StudioDetails: React.FC<IStudioDetailsProps> = ({
   }
 
   function maybeRenderStashBoxLink() {
-    if (!link) return;
+    const base = endpoint?.match(/https?:\/\/.*?\//)?.[0];
+    if (!base || !studio.remote_site_id) return;
 
     return (
-      <h6 className="mt-2">
-        <ExternalLink href={link}>
-          <FormattedMessage id="stashbox.source" />
-          <Icon icon={faExternalLinkAlt} className="ml-2" />
-        </ExternalLink>
-      </h6>
+      <StashIDPill
+        linkType="studios"
+        stashID={{ endpoint: endpoint, stash_id: studio.remote_site_id }}
+      />
     );
   }
 
@@ -303,12 +299,6 @@ const StudioModal: React.FC<IStudioModalProps> = ({
     handleStudioCreate(studioData, parentData);
   }
 
-  const base = endpoint?.match(/https?:\/\/.*?\//)?.[0];
-  const link = base ? `${base}studios/${studio.remote_site_id}` : undefined;
-  const parentLink = base
-    ? `${base}studios/${studio.parent?.remote_site_id}`
-    : undefined;
-
   function maybeRenderParentStudio() {
     // There is no parent studio or it already has a Stash ID
     if (!studio.parent || !sendParentStudio) {
@@ -342,7 +332,7 @@ const StudioModal: React.FC<IStudioModalProps> = ({
         studio={studio.parent}
         excluded={parentExcluded}
         toggleField={(field) => toggleParentField(field)}
-        link={parentLink}
+        endpoint={endpoint}
         isNew
       />
     );
@@ -365,7 +355,7 @@ const StudioModal: React.FC<IStudioModalProps> = ({
         studio={studio}
         excluded={excluded}
         toggleField={(field) => toggleField(field)}
-        link={link}
+        endpoint={endpoint}
       />
 
       {maybeRenderParentStudio()}
diff --git a/ui/v2.5/src/components/Tagger/tags/TagModal.tsx b/ui/v2.5/src/components/Tagger/tags/TagModal.tsx
index c04c0129e..94566fc4c 100644
--- a/ui/v2.5/src/components/Tagger/tags/TagModal.tsx
+++ b/ui/v2.5/src/components/Tagger/tags/TagModal.tsx
@@ -5,15 +5,11 @@ import { IconDefinition } from "@fortawesome/fontawesome-svg-core";
 import * as GQL from "src/core/generated-graphql";
 import { Icon } from "src/components/Shared/Icon";
 import { ModalComponent } from "src/components/Shared/Modal";
-import {
-  faCheck,
-  faExternalLinkAlt,
-  faTimes,
-} from "@fortawesome/free-solid-svg-icons";
+import { faCheck, faTimes } from "@fortawesome/free-solid-svg-icons";
 import { Button, Form } from "react-bootstrap";
 import { TruncatedText } from "src/components/Shared/TruncatedText";
 import { excludeFields } from "src/utils/data";
-import { ExternalLink } from "src/components/Shared/ExternalLink";
+import { StashIDPill } from "src/components/Shared/StashID";
 
 interface ITagModalProps {
   tag: GQL.ScrapedSceneTagDataFragment;
@@ -110,17 +106,13 @@ const TagModal: React.FC<ITagModalProps> = ({
 
   function maybeRenderStashBoxLink() {
     const base = endpoint?.match(/https?:\/\/.*?\//)?.[0];
-    const link = base ? `${base}tags/${tag.remote_site_id}` : undefined;
-
-    if (!link) return;
+    if (!base || !tag.remote_site_id) return;
 
     return (
-      <h6 className="mt-2">
-        <ExternalLink href={link}>
-          <FormattedMessage id="stashbox.source" />
-          <Icon icon={faExternalLinkAlt} className="ml-2" />
-        </ExternalLink>
-      </h6>
+      <StashIDPill
+        linkType="tags"
+        stashID={{ endpoint: endpoint, stash_id: tag.remote_site_id }}
+      />
     );
   }