diff --git a/core/src/help/help.rs b/core/src/help/help.rs
index 522b67f4..80ad1a29 100644
--- a/core/src/help/help.rs
+++ b/core/src/help/help.rs
@@ -50,9 +50,9 @@ impl Help {
 
 	#[inline]
 	pub fn arrow(&mut self, step: isize) -> bool {
-		let len = self.bindings.len();
-		self.offset = self.offset.min(len);
-		self.cursor = self.cursor.min(len.saturating_sub(1));
+		let max = self.bindings.len().saturating_sub(1);
+		self.offset = self.offset.min(max);
+		self.cursor = self.cursor.min(max);
 
 		if step > 0 { self.next(step as usize) } else { self.prev(step.unsigned_abs()) }
 	}
diff --git a/core/src/manager/folder.rs b/core/src/manager/folder.rs
index 9cb3ff1e..d94d6b38 100644
--- a/core/src/manager/folder.rs
+++ b/core/src/manager/folder.rs
@@ -35,9 +35,9 @@ impl Folder {
 			return false;
 		}
 
-		let len = self.files.len();
-		self.offset = self.offset.min(len);
-		self.cursor = self.cursor.min(len.saturating_sub(1));
+		let max = self.files.len().saturating_sub(1);
+		self.offset = self.offset.min(max);
+		self.cursor = self.cursor.min(max);
 		self.set_page(true);
 
 		self.hover_repos();