diff --git a/ui/v2.5/src/components/Shared/TagLink.tsx b/ui/v2.5/src/components/Shared/TagLink.tsx
index a59ac83cb..e572a76f8 100644
--- a/ui/v2.5/src/components/Shared/TagLink.tsx
+++ b/ui/v2.5/src/components/Shared/TagLink.tsx
@@ -36,7 +36,7 @@ const SortNameLinkComponent: React.FC<ISortNameLinkProps> = ({
     <Badge
       data-name={className}
       data-sort-name={sortName}
-      className={cx("tag-item", className)}
+      className={cx("tag-item tag-link", className)}
       variant="secondary"
     >
       <Link to={link}>{children}</Link>
@@ -55,7 +55,7 @@ const CommonLinkComponent: React.FC<ICommonLinkProps> = ({
   children,
 }) => {
   return (
-    <Badge className={cx("tag-item", className)} variant="secondary">
+    <Badge className={cx("tag-item tag-link", className)} variant="secondary">
       <Link to={link}>{children}</Link>
     </Badge>
   );
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index 4209abc2c..eedc84c01 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -710,6 +710,15 @@ div.dropdown-menu {
   margin: 5px;
   padding: 2px 6px;
 
+  // if link, move padding to link to make full tag clickable
+  &.tag-link {
+    padding: 0;
+
+    a {
+      padding: 2px 6px;
+    }
+  }
+
   &:hover {
     cursor: pointer;
   }