diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 95c42fbc4..5b074d019 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -91,13 +91,11 @@ impl Prompt {
         }
 
         let index = match direction {
-            CompletionDirection::Forward => {
-                self.selection.map_or(0, |i| i + 1) % self.completion.len()
-            }
+            CompletionDirection::Forward => self.selection.map_or(0, |i| i + 1),
             CompletionDirection::Backward => {
-                (self.selection.unwrap_or(0) + self.completion.len() - 1) % self.completion.len()
+                self.selection.unwrap_or(0) + self.completion.len() - 1
             }
-        };
+        } % self.completion.len();
 
         self.selection = Some(index);