diff --git a/app/(dashboard)/tasks/page.tsx b/app/(dashboard)/tasks/page.tsx
index a8a0ca2..e5decc0 100644
--- a/app/(dashboard)/tasks/page.tsx
+++ b/app/(dashboard)/tasks/page.tsx
@@ -1,9 +1,8 @@
 import { Suspense } from "react"
 import { Button } from "@/components/ui/button"
-import { Input } from "@/components/ui/input"
-import { Plus, Search } from "lucide-react"
+import { Plus } from "lucide-react"
 import Link from "next/link"
-import { TaskList } from "@/components/task-list"
+import { TasksPageClient } from "@/components/tasks-page-client"
 import { poppins } from "@/lib/fonts"
 
 import { getAllTasks } from "@/app/(dashboard)/tasks/actions"
@@ -31,7 +30,7 @@ export default async function TasksPage() {
             </div>
 
             <Suspense fallback={<div>Loading tasks...</div>}>
-                <TaskList initialTasks={tasks || []} />
+                <TasksPageClient initialTasks={tasks || []} />
             </Suspense>
         </div>
     )
diff --git a/components/tasks-page-client.tsx b/components/tasks-page-client.tsx
index e69de29..2ebd79f 100644
--- a/components/tasks-page-client.tsx
+++ b/components/tasks-page-client.tsx
@@ -0,0 +1,63 @@
+"use client"
+
+import { useState } from "react"
+import { Input } from "@/components/ui/input"
+import { Button } from "@/components/ui/button"
+import { Search, X, Filter } from "lucide-react"
+import { TaskList } from "@/components/task-list"
+import type { Task as PrismaTask, User } from "@/app/generated/prisma/client"
+
+type TaskWithProfile = PrismaTask & {
+  assignee?: Pick<User, "name"> | null
+}
+
+export function TasksPageClient({ initialTasks }: { initialTasks: TaskWithProfile[] }) {
+  const [searchQuery, setSearchQuery] = useState("")
+
+  const filteredTasks = searchQuery
+    ? initialTasks.filter((task) =>
+        task.name.includes(searchQuery)
+      )
+    : initialTasks
+
+  const handleClearSearch = () => {
+    setSearchQuery("")
+  }
+
+  return (
+    <div className="space-y-4">
+      <div className="flex items-center gap-2">
+        <div className="relative flex-1">
+          <Search
+            className="absolute left-3 top-1/2 h-4 w-4 -translate-y-1/2 text-muted-foreground"
+            aria-label="Search icon"
+          />
+          <Input
+            type="text"
+            placeholder="Search tasks..."
+            value={searchQuery}
+            onChange={(e) => setSearchQuery(e.target.value)}
+            className="pl-10 pr-10"
+            aria-label="Search tasks by title"
+          />
+          {searchQuery && (
+            <Button
+              variant="ghost"
+              size="icon"
+              onClick={handleClearSearch}
+              className="absolute right-1 top-1/2 h-8 w-8 -translate-y-1/2"
+              aria-label="Clear search"
+            >
+              <X className="h-4 w-4" />
+            </Button>
+          )}
+        </div>
+        <Button variant="outline" size="icon" aria-label="Filter tasks">
+          <Filter className="h-4 w-4" />
+        </Button>
+      </div>
+
+      <TaskList initialTasks={filteredTasks} />
+    </div>
+  )
+}