chirathr
diff --git a/‎src/app/blog/page.tsx‎
Lines changed: 8 additions & 3 deletions b/‎src/app/blog/page.tsx‎
Lines changed: 8 additions & 3 deletions
diff --git a/‎src/app/layout.tsx‎
Lines changed: 2 additions & 0 deletions b/‎src/app/layout.tsx‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/components/ui/back-button.tsx‎
Lines changed: 20 additions & 2 deletions b/‎src/components/ui/back-button.tsx‎
Lines changed: 20 additions & 2 deletions
@@ -1,7 +1,6 @@
 import { getSortedPostsData } from "@/lib/blog";
 import Link from "next/link";
-import { ExternalLink } from "lucide-react";
-import { BackButton } from "@/components/ui/back-button";
+import { ExternalLink, ArrowLeft } from "lucide-react";
 import { Metadata } from "next";
 
 export const metadata: Metadata = {
@@ -18,7 +17,13 @@ export default function BlogArchive() {
 
                 {/* Navigation */}
                 <nav className="mb-12 flex items-center justify-between">
-                    <BackButton fallback="/" />
+                    <Link
+                        href="/"
+                        className="group flex items-center gap-2 text-sm font-semibold tracking-wide text-zinc-500 hover:text-blue-400 transition-colors uppercase"
+                    >
+                        <ArrowLeft size={16} className="transition-transform group-hover:-translate-x-1" />
+                        Back
+                    </Link>
                     <Link
                         href="/"
                         className="text-sm font-semibold tracking-wide text-zinc-500 hover:text-blue-400 transition-colors uppercase"
 
@@ -13,6 +13,7 @@ const geistMono = Geist_Mono({
 });
 
 import { portfolioData } from "@/data/portfolio";
+import { AppNavigationTracker } from "@/components/ui/back-button";
 
 export const metadata: Metadata = {
   title: `${portfolioData.personalInfo.name} | ${portfolioData.personalInfo.tagline}`,
@@ -29,6 +30,7 @@ export default function RootLayout({
       <body
         className={`${geistSans.variable} ${geistMono.variable} antialiased`}
       >
+        <AppNavigationTracker />
         {children}
       </body>
     </html>
 
@@ -1,12 +1,30 @@
 "use client";
 
-import { useRouter } from "next/navigation";
+import { useRouter, usePathname } from "next/navigation";
 import { ArrowLeft } from "lucide-react";
+import { useEffect, useRef } from "react";
+
+export function AppNavigationTracker() {
+    const pathname = usePathname();
+    const isFirstRender = useRef(true);
+
+    useEffect(() => {
+        if (isFirstRender.current) {
+            isFirstRender.current = false;
+            (window as any).isInternalNavigation = false;
+        } else {
+            (window as any).isInternalNavigation = true;
+        }
+    }, [pathname]);
+
+    return null;
+}
+
 export function BackButton({ fallback = "/" }: { fallback?: string }) {
     const router = useRouter();
 
     const handleBack = () => {
-        if (typeof window !== "undefined" && window.history.length > 2) {
+        if (typeof window !== "undefined" && (window as any).isInternalNavigation) {
             router.back();
         } else {
             router.push(fallback);