diff --git a/Source/UI/CandidateUI/HorizontalCandidateController.swift b/Source/UI/CandidateUI/HorizontalCandidateController.swift
index a6494bb7..35e8e6e8 100644
--- a/Source/UI/CandidateUI/HorizontalCandidateController.swift
+++ b/Source/UI/CandidateUI/HorizontalCandidateController.swift
@@ -259,6 +259,10 @@ public class HorizontalCandidateController: CandidateController {
             return false
         }
 
+        if pageCount == 1 {
+            return highlightNextCandidate()
+        }
+
         if currentPage + 1 >= pageCount {
             currentPage = 0
         } else {
@@ -275,6 +279,10 @@ public class HorizontalCandidateController: CandidateController {
             return false
         }
 
+        if pageCount == 1 {
+            return highlightPreviousCandidate()
+        }
+
         if currentPage == 0 {
             currentPage = pageCount - 1
         } else {
diff --git a/Source/UI/CandidateUI/VerticalCandidateController.swift b/Source/UI/CandidateUI/VerticalCandidateController.swift
index 05a9b4dd..4cae2144 100644
--- a/Source/UI/CandidateUI/VerticalCandidateController.swift
+++ b/Source/UI/CandidateUI/VerticalCandidateController.swift
@@ -265,6 +265,10 @@ public class VerticalCandidateController: CandidateController {
             return false
         }
 
+        if pageCount == 1 {
+            return highlightNextCandidate()
+        }
+
         if currentPage + 1 >= pageCount {
             currentPage = 0
         } else {
@@ -281,6 +285,10 @@ public class VerticalCandidateController: CandidateController {
             return false
         }
 
+        if pageCount == 1 {
+            return highlightPreviousCandidate()
+        }
+
         if currentPage == 0 {
             currentPage = pageCount - 1
         } else {