diff --git a/src/pages/master/aldeias/blocks/ListToolbar.tsx b/src/pages/master/aldeias/blocks/ListToolbar.tsx
index 085ac6e..c5c77ab 100644
--- a/src/pages/master/aldeias/blocks/ListToolbar.tsx
+++ b/src/pages/master/aldeias/blocks/ListToolbar.tsx
@@ -16,6 +16,7 @@ const ListToolbar = () => {
 
   const handleSearch = () => {
     table.getColumn('name')?.setFilterValue(searchValue);
+    table.setPageIndex(0);
   };
 
   return (
diff --git a/src/pages/master/municipios/blocks/ListToolbar.tsx b/src/pages/master/municipios/blocks/ListToolbar.tsx
index c8415b5..140850c 100644
--- a/src/pages/master/municipios/blocks/ListToolbar.tsx
+++ b/src/pages/master/municipios/blocks/ListToolbar.tsx
@@ -28,6 +28,7 @@ const ListToolbar = () => {
 
   const handleSearch = () => {
     table.getColumn('name')?.setFilterValue(searchValue);
+    table.setPageIndex(0);
   };
 
   return (
diff --git a/src/pages/master/postoadms/blocks/ListToolbar.tsx b/src/pages/master/postoadms/blocks/ListToolbar.tsx
index ed9f7eb..6d2e7ca 100644
--- a/src/pages/master/postoadms/blocks/ListToolbar.tsx
+++ b/src/pages/master/postoadms/blocks/ListToolbar.tsx
@@ -17,6 +17,7 @@ const ListToolbar = () => {
 
   const handleSearch = () => {
     table.getColumn('name')?.setFilterValue(searchPosto);
+    table.setPageIndex(0);
   };
 
   return (
diff --git a/src/pages/master/sucos/blocks/ListToolbar.tsx b/src/pages/master/sucos/blocks/ListToolbar.tsx
index 9e644c4..75e52e4 100644
--- a/src/pages/master/sucos/blocks/ListToolbar.tsx
+++ b/src/pages/master/sucos/blocks/ListToolbar.tsx
@@ -16,6 +16,7 @@ const ListToolbar = () => {
 
   const handleSearch = () => {
     table.getColumn('sucos_name')?.setFilterValue(searchValue);
+    table.setPageIndex(0);
   };
 
   return (
diff --git a/src/pages/master/sucos/hooks/ManageSucosContext.tsx b/src/pages/master/sucos/hooks/ManageSucosContext.tsx
index 71f3f0c..c77539a 100644
--- a/src/pages/master/sucos/hooks/ManageSucosContext.tsx
+++ b/src/pages/master/sucos/hooks/ManageSucosContext.tsx
@@ -159,7 +159,7 @@ const ManageSucosContextProvider = ({ children }: { children: React.ReactNode })
         filter: JSON.stringify(filter)
       });
       // console.log('Sucos List Response:', response?.data);
-      setSucos(response?.data.list || []); // Pastikan default value adalah array kosong
+      setSucos(response?.data.list || []);
       return { data: response?.data.list, totalCount: response?.data.total_count };
     } catch (error) {
       console.error('Error fetching Sucos', error);
diff --git a/src/pages/master/wallet/blocks/ListToolbar.tsx b/src/pages/master/wallet/blocks/ListToolbar.tsx
index b8a36b3..1e38aa5 100644
--- a/src/pages/master/wallet/blocks/ListToolbar.tsx
+++ b/src/pages/master/wallet/blocks/ListToolbar.tsx
@@ -1,10 +1,23 @@
 import { DefaultTooltip, KeenIcon, useDataGrid } from '@/components';
 import { Button } from '@/components/ui/button';
 import { useManageWalletContext } from '../hooks/useManageWalletContext';
+import React, { useState } from 'react';
 
 const ListToolbar = () => {
   const { reload, table } = useDataGrid();
   const { handleAddDialog } = useManageWalletContext();
+  const [searchValue, setSearchValue] = useState('');
+
+  const handleKeyDown = (event: React.KeyboardEvent) => {
+    if (event.key === 'Enter') {
+      handleSearch();
+    }
+  };
+
+  const handleSearch = () => {
+    table.getColumn('wallets.name')?.setFilterValue(searchValue);
+    table.setPageIndex(0);
+  };
 
   return (
     <div className="card-header flex-wrap gap-2 border-b-0 px-5">
@@ -16,12 +29,16 @@ const ListToolbar = () => {
               <input
                 type="text"
                 placeholder="Search Wallet"
-                value={(table.getColumn('wallets.name')?.getFilterValue() as string) ?? ''}
-                onChange={(event) =>
-                  table.getColumn('wallets.name')?.setFilterValue(event.target.value)
-                }
+                value={searchValue}
+                onChange={(event) => setSearchValue(event.target.value)}
+                onKeyDown={handleKeyDown}
               />
             </label>
+            <DefaultTooltip title={'Search'} placement={'top'}>
+              <Button variant="outline" className="h-7.5" onClick={handleSearch}>
+                <KeenIcon icon="magnifier" />
+              </Button>
+            </DefaultTooltip>
             {/* <DefaultTooltip title={'Filter'} placement={'top'}>
               <Button
                 variant="outline"
diff --git a/src/pages/master/wallet/hooks/ManageWalletContext.tsx b/src/pages/master/wallet/hooks/ManageWalletContext.tsx
index 823d6eb..90224dd 100644
--- a/src/pages/master/wallet/hooks/ManageWalletContext.tsx
+++ b/src/pages/master/wallet/hooks/ManageWalletContext.tsx
@@ -146,7 +146,7 @@ const ManageWalletContextProvider = ({ children }: { children: React.ReactNode }
   const getWalletLists = async (page: number, limit: number, sorting: any, filter: any) => {
     try {
       sorting = sorting.length == 0 ? [{ id: 'name', desc: false }] : sorting;
-      filter = filter.length == 0 ? {} : { name: { like: `%${filter[0].value?.toLowerCase()}%` } };
+      filter = filter.length == 0 ? {} : { 'wallets.name': { like: `%${filter[0].value?.toLowerCase()}%` } };
       const response = await GetData(`${API_URL_MASTER_DATA}/wallet/list`, {
         limit,
         page: page + 1,