diff --git a/src/components/BackButton.tsx b/src/components/BackButton.tsx
new file mode 100644
index 0000000..9b59d6f
--- /dev/null
+++ b/src/components/BackButton.tsx
@@ -0,0 +1,34 @@
+import { ArrowLeft } from 'lucide-react';
+import { useLocation, useNavigate } from 'react-router-dom';
+
+type BackButtonProps = {
+  fallbackTo: string;
+  label?: string;
+};
+
+const BackButton = ({ fallbackTo, label = 'Voltar' }: BackButtonProps) => {
+  const navigate = useNavigate();
+  const location = useLocation();
+
+  const handleClick = () => {
+    if (location.key !== 'default' && window.history.length > 1) {
+      navigate(-1);
+      return;
+    }
+
+    navigate(fallbackTo, { replace: true });
+  };
+
+  return (
+    <button
+      type="button"
+      onClick={handleClick}
+      className="inline-flex w-fit items-center text-sm font-bold text-zinc-400 dark:text-dark-muted transition-colors hover:text-zinc-900 dark:hover:text-dark-text"
+    >
+      <ArrowLeft className="mr-2 h-4 w-4" />
+      {label}
+    </button>
+  );
+};
+
+export default BackButton;
diff --git a/src/pages/ClientDetails.tsx b/src/pages/ClientDetails.tsx
index 1f7e359..085014a 100644
--- a/src/pages/ClientDetails.tsx
+++ b/src/pages/ClientDetails.tsx
@@ -1,7 +1,8 @@
 import { useEffect, useState } from 'react';
 import { useParams, Link, useOutletContext } from 'react-router-dom';
-import { ArrowLeft, User, Tag, Package, DollarSign, Clock, Phone, ChevronDown, ShoppingBag, ReceiptText } from 'lucide-react';
+import { User, Tag, Package, DollarSign, Clock, Phone, ChevronDown, ShoppingBag, ReceiptText } from 'lucide-react';
 import { AreaChart, Area, BarChart, Bar, Cell, XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer } from 'recharts';
+import BackButton from '../components/BackButton';
 import DateRangePicker from '../components/DateRangePicker';
 import PaginationControls from '../components/PaginationControls';
 import RefreshStatus from '../components/RefreshStatus';
@@ -275,10 +276,7 @@ const ClientDetails = () => {
     <div className="space-y-6">
       {/* Header Area */}
       <div className="flex flex-col gap-4">
-        <Link to="/clients" className="inline-flex items-center text-sm font-bold text-zinc-400 dark:text-dark-muted hover:text-zinc-900 dark:hover:text-dark-text transition-colors w-fit">
-          <ArrowLeft className="w-4 h-4 mr-2" />
-          Voltar
-        </Link>
+        <BackButton fallbackTo="/clients" />
         
         <div className="flex flex-col md:flex-row md:items-end justify-between gap-6">
           <div className="flex items-center gap-4">
diff --git a/src/pages/ProductDetails.tsx b/src/pages/ProductDetails.tsx
index 159f35f..eaf9cb5 100644
--- a/src/pages/ProductDetails.tsx
+++ b/src/pages/ProductDetails.tsx
@@ -1,7 +1,8 @@
 import { useEffect, useState } from 'react';
 import { useParams, Link, useOutletContext } from 'react-router-dom';
-import { ArrowLeft, Package, DollarSign, ReceiptText, Warehouse } from 'lucide-react';
+import { Package, DollarSign, ReceiptText, Warehouse } from 'lucide-react';
 import { AreaChart, Area, XAxis, YAxis, CartesianGrid, Tooltip, ResponsiveContainer } from 'recharts';
+import BackButton from '../components/BackButton';
 import DateRangePicker from '../components/DateRangePicker';
 import RefreshStatus from '../components/RefreshStatus';
 import type { DateRange, ProductDetailsAnalytics } from '../types';
@@ -209,10 +210,7 @@ const ProductDetails = () => {
     <div className="space-y-6">
       <div className="flex flex-col md:flex-row md:items-center justify-between gap-4">
         <div className="flex flex-col gap-4">
-          <Link to="/products" className="inline-flex items-center text-sm font-bold text-zinc-400 dark:text-dark-muted hover:text-zinc-900 dark:hover:text-dark-text transition-colors w-fit">
-            <ArrowLeft className="w-4 h-4 mr-2" />
-            Voltar
-          </Link>
+          <BackButton fallbackTo="/products" />
           
           <div className="flex items-center gap-4">
             <div className="w-16 h-16 rounded-2xl bg-white dark:bg-dark-card border border-zinc-200 dark:border-dark-border flex items-center justify-center shadow-sm text-brand-primary">