diff --git a/src/app/(app)/stock-orders/StockOrdersTable.tsx b/src/app/(app)/stock-orders/StockOrdersTable.tsx
index 0d26750..717957e 100644
--- a/src/app/(app)/stock-orders/StockOrdersTable.tsx
+++ b/src/app/(app)/stock-orders/StockOrdersTable.tsx
@@ -2,6 +2,7 @@
 
 import { useState } from "react";
 import Link from "next/link";
+import { useRouter } from "next/navigation";
 import {
   Table,
   TableBody,
@@ -105,6 +106,8 @@ export default function StockOrdersTable({
   const [quickDraftOpen, setQuickDraftOpen] = useState(false);
   const [editingPurchaseId, setEditingPurchaseId] = useState<string | null>(null);
 
+  const router = useRouter();
+
   const openEditForDraft = (purchaseId: string) => {
     setEditingPurchaseId(purchaseId);
     setQuickDraftOpen(true);
@@ -200,7 +203,7 @@ export default function StockOrdersTable({
                       key={row.id}
                       className="cursor-pointer"
                       onClick={() => {
-                        window.location.href = `/stock-orders/${row.id}`;
+                        router.push(`/stock-orders/${row.id}`);
                       }}
                     >
                       <TableCell className="font-medium">
@@ -266,6 +269,10 @@ export default function StockOrdersTable({
           <Link
             href={pageHref(page - 1)}
             aria-disabled={page <= 1}
+            tabIndex={page <= 1 ? -1 : undefined}
+            onClick={(e) => {
+              if (page <= 1) e.preventDefault();
+            }}
             className={cn(
               buttonVariants({ variant: "outline", size: "sm" }),
               page <= 1 && "pointer-events-none opacity-50",
@@ -279,6 +286,10 @@ export default function StockOrdersTable({
           <Link
             href={pageHref(page + 1)}
             aria-disabled={page >= totalPages}
+            tabIndex={page >= totalPages ? -1 : undefined}
+            onClick={(e) => {
+              if (page >= totalPages) e.preventDefault();
+            }}
             className={cn(
               buttonVariants({ variant: "outline", size: "sm" }),
               page >= totalPages && "pointer-events-none opacity-50",