diff --git a/app/components/syntax/PrevNextLinks.tsx b/app/components/syntax/PrevNextLinks.tsx
index 990613a..68ed673 100644
--- a/app/components/syntax/PrevNextLinks.tsx
+++ b/app/components/syntax/PrevNextLinks.tsx
@@ -40,9 +40,9 @@ function PageLink({
         >
           <p className="flex flex-col gap-0">
             {pageCategory && (
-              <span className="text-violet-600 dark:text-violet-400 text-sm -mb-3">{pageCategory.title}</span>
+              <span className="text-violet-600 dark:text-violet-400 text-sm mb-1 leading-3">{pageCategory.title}</span>
             )}
-            <span>{title}</span>
+            <span className="leading-4">{title}</span>
           </p>
           <ArrowIcon className={clsx("h-6 w-6 flex-none fill-current", dir === "previous" && "-scale-x-100")} />
         </Link>
@@ -65,7 +65,13 @@ export function PrevNextLinks() {
     if (linkIndex === -1) return [null, null];
 
     const previousPage = allLinks[linkIndex - 1] || null;
-    const nextPage = allLinks[linkIndex + 1] || null;
+    let nextPage = allLinks[linkIndex + 1] || null;
+
+    // In case the next page is the same as the current page (in subitems),
+    // we need to skip it to get the correct next page.
+    if (nextPage.href === urlPathname) {
+      nextPage = allLinks[linkIndex + 2] || null;
+    }
 
     return [previousPage, nextPage];
   };