diff --git a/Source/UI/CandidateUI/HorizontalCandidateController.swift b/Source/UI/CandidateUI/HorizontalCandidateController.swift
index 24489a70..8419a16b 100644
--- a/Source/UI/CandidateUI/HorizontalCandidateController.swift
+++ b/Source/UI/CandidateUI/HorizontalCandidateController.swift
@@ -260,7 +260,7 @@ public class HorizontalCandidateController: CandidateController {
         }
 
         if currentPage + 1 >= pageCount {
-            return false
+            currentPage = 1
         }
 
         currentPage += 1
@@ -275,7 +275,7 @@ public class HorizontalCandidateController: CandidateController {
         }
 
         if currentPage == 0 {
-            return false
+            currentPage = pageCount
         }
 
         currentPage -= 1
diff --git a/Source/UI/CandidateUI/VerticalCandidateController.swift b/Source/UI/CandidateUI/VerticalCandidateController.swift
index 708422ae..e2432248 100644
--- a/Source/UI/CandidateUI/VerticalCandidateController.swift
+++ b/Source/UI/CandidateUI/VerticalCandidateController.swift
@@ -266,7 +266,7 @@ public class VerticalCandidateController: CandidateController {
         }
 
         if currentPage + 1 >= pageCount {
-            return false
+            currentPage = 1
         }
 
         currentPage += 1
@@ -281,7 +281,7 @@ public class VerticalCandidateController: CandidateController {
         }
 
         if currentPage == 0 {
-            return false
+            currentPage = pageCount
         }
 
         currentPage -= 1