diff --git a/src/cli/remote.rs b/src/cli/remote.rs
index ea1ba01..b146513 100644
--- a/src/cli/remote.rs
+++ b/src/cli/remote.rs
@@ -41,9 +41,7 @@ impl TryFrom<&Args> for RemoteArgs {
             (_, _) => Err("Too many arguments".to_string()),
         }?;
         // parse bookmark first
-        let last_item_index = (args.bookmark.len() + args.positional.len())
-            .checked_sub(1)
-            .unwrap_or_default();
+        let last_item_index = (args.bookmark.len() + args.positional.len()).saturating_sub(1);
 
         let mut hosts = vec![];
 
diff --git a/src/ui/activities/filetransfer/components/transfer/file_list.rs b/src/ui/activities/filetransfer/components/transfer/file_list.rs
index 3a97a06..e84b3a4 100644
--- a/src/ui/activities/filetransfer/components/transfer/file_list.rs
+++ b/src/ui/activities/filetransfer/components/transfer/file_list.rs
@@ -240,7 +240,7 @@ impl MockComponent for FileList {
         }
 
         State::One(StateValue::Usize(if self.has_dot_dot() {
-            self.states.list_index.checked_sub(1).unwrap_or_default()
+            self.states.list_index.saturating_sub(1)
         } else {
             self.states.list_index
         }))