diff --git a/src/components/Link.tsx b/src/components/Link.tsx
index 05aa574e3..576727433 100644
--- a/src/components/Link.tsx
+++ b/src/components/Link.tsx
@@ -5,7 +5,7 @@ import { useRouter } from 'next/navigation';
 import { forwardRef } from 'react';
 
 export const Link = forwardRef<HTMLAnchorElement, LinkProps>(
-  ({ href, onClick, ...props }, ref) => {
+  ({ href, onClick, target, ...props }, ref) => {
     const router = useRouter();
 
     return (
@@ -15,7 +15,7 @@ export const Link = forwardRef<HTMLAnchorElement, LinkProps>(
         onClick={(event) => {
           event.preventDefault();
           if (href) {
-            if (event.ctrlKey || event.metaKey) {
+            if (event.ctrlKey || event.metaKey || target === '_blank') {
               window.open(href);
             } else {
               router.push(href);
diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx
index c69c07863..46b317aa4 100644
--- a/src/components/Navbar/index.tsx
+++ b/src/components/Navbar/index.tsx
@@ -95,7 +95,7 @@ export default function Navbar() {
                       color="gray"
                       highContrast={selected}
                       size="2"
-                      href={`tools/${tool.id}`}
+                      href={`/tools/${tool.id}`}
                       underline={selected ? 'always' : 'hover'}
                     >
                       {tool.title}
@@ -121,7 +121,7 @@ export default function Navbar() {
               <Link
                 style={{ display: 'flex', alignContent: 'center' }}
                 color="gray"
-                href="https://discord.gg/nDt7AjGJQH"
+                href="https://www.patreon.com/tresabhi"
                 underline="none"
                 target="_blank"
                 onClick={() => setShowHamburgerMenu(false)}