diff --git a/src/app/[locale]/(main)/user/wishlist/page.tsx b/src/app/[locale]/(main)/user/wishlist/page.tsx
index 1a23dc20..6be01c9d 100644
--- a/src/app/[locale]/(main)/user/wishlist/page.tsx
+++ b/src/app/[locale]/(main)/user/wishlist/page.tsx
@@ -1,3 +1,4 @@
+"use client"
 import { retrieveCustomer } from "@/lib/data/customer"
 import { redirect } from "next/navigation"
 import { isEmpty } from "lodash"
@@ -7,23 +8,84 @@ import { Button } from "@/components/atoms"
 import { WishlistItem } from "@/components/cells"
 import { getUserWishlists } from "@/lib/data/wishlist"
 import { HttpTypes } from "@medusajs/types"
-import { UserNavigation } from "@/components/molecules"
+import { SelectField, UserNavigation } from "@/components/molecules"
+import { ProductsPagination } from "@/components/organisms"
+import { useEffect, useState } from "react"
+import { usePagination } from "@/hooks/usePagination"
 
-export default async function Wishlist() {
-  const user = await retrieveCustomer()
+const ITEMS_PER_PAGE = 10
 
-  let wishlist: WishlistType[] = []
-  if (user) {
-    const response = await getUserWishlists()
-    wishlist = response.wishlists
+const sortOptions = [
+  { label: "Newest", value: "created_at" },
+  { label: "Price: Low to High", value: "price_asc" },
+  { label: "Price: High to Low", value: "price_desc" },
+]
+
+export default function Wishlist() {
+  const [user, setUser] = useState<any>(null)
+  const [wishlist, setWishlist] = useState<WishlistType[]>([])
+  const [sortBy, setSortBy] = useState("created_at")
+  const [loading, setLoading] = useState(true)
+  const [totalCount, setTotalCount] = useState(0)
+  const { currentPage, setPage } = usePagination()
+
+  useEffect(() => {
+    const fetchData = async () => {
+      setLoading(true)
+      const userData = await retrieveCustomer()
+
+      if (!userData) {
+        redirect("/user")
+      }
+
+      setUser(userData)
+
+      const response = await getUserWishlists()
+      setWishlist(response.wishlists)
+      setTotalCount(response.count)
+      setLoading(false)
+    }
+
+    fetchData()
+  }, [])
+
+  const sortProducts = (products: any[]) => {
+    if (!products) return []
+
+    return [...products].sort((a, b) => {
+      if (sortBy === "created_at") {
+        return new Date(b.created_at).getTime() - new Date(a.created_at).getTime()
+      } else if (sortBy === "price_asc") {
+        return a.calculated_amount - b.calculated_amount
+      } else if (sortBy === "price_desc") {
+        return b.calculated_amount - a.calculated_amount
+      }
+      return 0
+    })
   }
 
-  const count = wishlist?.[0]?.products?.length || 0
+  const handleSortChange = (value: string) => {
+    setSortBy(value)
+    if (currentPage !== 1) {
+      setPage('1')
+    }
+  }
 
-  if (!user) {
-    redirect("/user")
+  if (loading) {
+    return <div className="container">Loading...</div>
   }
 
+  const allProducts = wishlist?.[0]?.products || []
+  const count = allProducts.length || 0
+
+  const sortedAllProducts = sortProducts(allProducts)
+
+  const totalPages = Math.ceil(count / ITEMS_PER_PAGE) || 1
+
+  const startIndex = (currentPage - 1) * ITEMS_PER_PAGE
+  const endIndex = startIndex + ITEMS_PER_PAGE
+  const sortedProducts = sortedAllProducts.slice(startIndex, endIndex)
+
   return (
     <main className="container">
       <div className="grid grid-cols-1 md:grid-cols-4 mt-6 gap-5 md:gap-8">
@@ -45,10 +107,19 @@ export default async function Wishlist() {
             <div className="flex flex-col gap-6">
               <h2 className="heading-lg text-primary uppercase">Wishlist</h2>
               <div className="flex justify-between items-center">
-                <p>{count} listings</p>
+                <p>{count} listings (showing {sortedProducts.length} on this page)</p>
+                <div className="flex gap-2 items-center">
+                  Sort by:{' '}
+                  <SelectField
+                    className="min-w-[200px]"
+                    options={sortOptions}
+                    selected={sortBy}
+                    selectOption={handleSortChange}
+                  />
+                </div>
               </div>
               <div className="flex flex-wrap max-md:justify-center gap-4">
-                {wishlist?.[0].products?.map((product) => (
+                {sortedProducts.map((product) => (
                   <WishlistItem
                     key={product.id}
                     product={
@@ -62,6 +133,7 @@ export default async function Wishlist() {
                   />
                 ))}
               </div>
+              <ProductsPagination pages={totalPages} />
             </div>
           )}
         </div>
diff --git a/src/components/cells/WishlistItem/WishlistItem.tsx b/src/components/cells/WishlistItem/WishlistItem.tsx
index dfad1aad..a6a4279b 100644
--- a/src/components/cells/WishlistItem/WishlistItem.tsx
+++ b/src/components/cells/WishlistItem/WishlistItem.tsx
@@ -31,7 +31,7 @@ export const WishlistItem = ({
       )}
     >
       <div className="relative w-full h-full bg-primary aspect-square">
-        <div className="absolute right-3 top-3 z-10 cursor-pointer">
+        <div className="absolute right-3 top-3 z-[1] cursor-pointer">
           <WishlistButton
             productId={product.id}
             wishlist={wishlist}
diff --git a/src/lib/data/wishlist.ts b/src/lib/data/wishlist.ts
index d8461f4b..7db6c700 100644
--- a/src/lib/data/wishlist.ts
+++ b/src/lib/data/wishlist.ts
@@ -4,7 +4,13 @@ import { sdk } from "../config"
 import { getAuthHeaders } from "./cookies"
 import { revalidatePath } from "next/cache"
 
-export const getUserWishlists = async () => {
+export const getUserWishlists = async ({
+  page = 1,
+  limit = 12,
+}: {
+  page?: number
+  limit?: number
+} = {}) => {
   const headers = {
     ...(await getAuthHeaders()),
     "Content-Type": "application/json",
@@ -12,8 +18,16 @@ export const getUserWishlists = async () => {
       .NEXT_PUBLIC_MEDUSA_PUBLISHABLE_KEY as string,
   }
 
+  // Calculate offset from page number
+  const offset = (page - 1) * limit
+
+  const queryParams = new URLSearchParams({
+    offset: offset.toString(),
+    limit: limit.toString(),
+  }).toString()
+
   return sdk.client
-    .fetch<{ wishlists: Wishlist[]; count: number }>(`/store/wishlist`, {
+    .fetch<{ wishlists: Wishlist[]; count: number }>(`/store/wishlist?${queryParams}`, {
       cache: "no-cache",
       headers,
       method: "GET",