diff --git a/src/App.tsx b/src/App.tsx
index ac6462d..8877cdb 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -9,6 +9,7 @@ import { useFilters } from "./controllers/useFilters";
 import { PokemonList } from "./components/PokemonList/PokemonList";
 import { FavoritePokemon } from "./components/FavoritePokemon/FavoritePokemon";
 import { Filter } from "./components/Filter/Filter";
+import { GetNextFiltered, GetPrevFiltered } from "./controllers/pokemonController";
 
 export default function App() {
   const [currentId, setCurrentId] = useState(1);
@@ -21,12 +22,18 @@ export default function App() {
     queryFn: () => getPokemonByID(currentId),
   });
 
-  const handlePrevious = () => {
-    setCurrentId((prev) => Math.max(1, prev - 1));
+  const handlePrevious = async () => {
+    const prevPokemon = await GetPrevFiltered(currentId, filters);
+    if (prevPokemon) {
+      setCurrentId(prevPokemon.id);
+    }
   };
 
-  const handleNext = () => {
-    setCurrentId((prev) => prev + 1);
+  const handleNext = async () => {
+    const nextPokemon = await GetNextFiltered(currentId, filters);
+    if (nextPokemon) {
+      setCurrentId(nextPokemon.id);
+    }
   };
 
   const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
@@ -98,4 +105,4 @@ export default function App() {
       </div>
     </div>
   );
-}
+}
\ No newline at end of file