diff --git a/src/components/link.js b/src/components/link.js
index c6ea6db8881..208ac07d81d 100644
--- a/src/components/link.js
+++ b/src/components/link.js
@@ -26,14 +26,19 @@ const GatsbyLinkWithoutSxProps = React.forwardRef(function GatsbyLinkWithoutSxPr
   return <GatsbyLink ref={ref} {...omit(props, 'sx', 'underline', 'hoverColor', 'muted')} />
 })
 
-const Link = React.forwardRef(function Link({to, href, ...props}, ref) {
+const Link = React.forwardRef(function Link({to, href, showUnderline = false, sx, ...props}, ref) {
   const localPath = getLocalPath(href)
 
+  const linkStyles = {
+    ...sx,
+    ...(showUnderline && {textDecoration: 'underline'}),
+  }
+
   if (to || localPath !== null) {
-    return <PrimerLink ref={ref} as={GatsbyLinkWithoutSxProps} to={to || localPath} {...props} />
+    return <PrimerLink ref={ref} as={GatsbyLinkWithoutSxProps} to={to || localPath} sx={linkStyles} {...props} />
   }
 
-  return <PrimerLink ref={ref} href={href} {...props} />
+  return <PrimerLink ref={ref} href={href} sx={linkStyles} {...props} />
 })
 
 export const LinkNoUnderline = React.forwardRef(function LinkNoUnderline({sx, ...props}, ref) {
diff --git a/src/components/page-footer.js b/src/components/page-footer.js
index 96f0b692477..74eaa5c51f6 100644
--- a/src/components/page-footer.js
+++ b/src/components/page-footer.js
@@ -46,8 +46,14 @@ const Contributors = ({contributors = [], latestCommit}) => {
       </Box>
       {latestCommit ? (
         <Text sx={{fontSize: 1, mt: 1}}>
-          Last edited by <Link href={`https://github.com/${latestCommit.login}`}>{latestCommit.login}</Link> on{' '}
-          <Link href={latestCommit.url}>{format(new Date(latestCommit.date))}</Link>
+          Last edited by{' '}
+          <Link href={`https://github.com/${latestCommit.login}`} showUnderline={true}>
+            {latestCommit.login}
+          </Link>{' '}
+          on{' '}
+          <Link href={latestCommit.url} showUnderline={true}>
+            {format(new Date(latestCommit.date))}
+          </Link>
         </Text>
       ) : null}
     </>
diff --git a/src/components/table-of-contents.js b/src/components/table-of-contents.js
index ed2acb5a77e..c0c11bf7167 100644
--- a/src/components/table-of-contents.js
+++ b/src/components/table-of-contents.js
@@ -26,7 +26,14 @@ const TableOfContentsItems = ({items, depth}) => (
 )
 
 const TableOfContents = ({'aria-labelledby': ariaLabelledBy, items, depth = 1, ...props}) => (
-  <NavList aria-labelledby={ariaLabelledBy} {...props}>
+  <NavList
+    aria-labelledby={ariaLabelledBy}
+    {...props}
+    sx={{
+      textDecoration: 'underline',
+      ...props.sx,
+    }}
+  >
     <TableOfContentsItems items={items} depth={depth} />
   </NavList>
 )