diff --git a/src/app.rs b/src/app.rs
index e48c2039..70e803c7 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -16,7 +16,7 @@ use crate::{
     tabs::{Revlog, StashList, Stashing, Status},
     ui::style::{SharedTheme, Theme},
 };
-use anyhow::{anyhow, Result};
+use anyhow::{bail, Result};
 use asyncgit::{sync, AsyncNotification, CWD};
 use crossbeam_channel::Sender;
 use crossterm::event::{Event, KeyEvent};
@@ -199,7 +199,7 @@ impl App {
             1 => self.revlog.draw(f, chunks_main[1])?,
             2 => self.stashing_tab.draw(f, chunks_main[1])?,
             3 => self.stashlist_tab.draw(f, chunks_main[1])?,
-            _ => return Err(anyhow!("unknown tab")),
+            _ => bail!("unknown tab"),
         };
 
         self.draw_popups(f)?;
diff --git a/src/components/externaleditor.rs b/src/components/externaleditor.rs
index 74e37858..e11c5817 100644
--- a/src/components/externaleditor.rs
+++ b/src/components/externaleditor.rs
@@ -7,7 +7,7 @@ use crate::{
     strings,
     ui::{self, style::SharedTheme},
 };
-use anyhow::{anyhow, Result};
+use anyhow::{anyhow, bail, Result};
 use asyncgit::{sync::utils::repo_work_dir, CWD};
 use crossterm::{
     event::Event,
@@ -56,7 +56,7 @@ impl ExternalEditorComponent {
         };
 
         if !path.exists() {
-            return Err(anyhow!("file not found: {:?}", path));
+            bail!("file not found: {:?}", path);
         }
 
         io::stdout().execute(LeaveAlternateScreen)?;
diff --git a/src/components/utils/filetree.rs b/src/components/utils/filetree.rs
index 9120ddbf..b77c7ad2 100644
--- a/src/components/utils/filetree.rs
+++ b/src/components/utils/filetree.rs
@@ -1,4 +1,4 @@
-use anyhow::Result;
+use anyhow::{bail, Result};
 use asyncgit::StatusItem;
 use std::{
     collections::BTreeSet,
@@ -75,9 +75,7 @@ impl FileTreeItem {
                 ),
                 kind: FileTreeItemKind::File(item.clone()),
             }),
-            None => {
-                Err(anyhow::anyhow!("invalid file name {:?}", item))
-            }
+            None => bail!("invalid file name {:?}", item),
         }
     }
 
@@ -102,10 +100,7 @@ impl FileTreeItem {
                     collapsed,
                 )),
             }),
-
-            None => Err(anyhow::anyhow!(
-                "failed to create item from path"
-            )),
+            None => bail!("failed to create item from path"),
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 976d8d41..560d52ee 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -26,7 +26,7 @@ mod ui;
 mod version;
 
 use crate::app::App;
-use anyhow::{anyhow, Result};
+use anyhow::{anyhow, bail, Result};
 use asyncgit::AsyncNotification;
 use backtrace::Backtrace;
 use clap::{
@@ -213,7 +213,7 @@ fn select_event(
         1 => oper.recv(rx_git).map(QueueEvent::GitEvent),
         2 => oper.recv(rx_ticker).map(|_| QueueEvent::Tick),
         3 => oper.recv(rx_spinner).map(|_| QueueEvent::SpinnerUpdate),
-        _ => return Err(anyhow!("unknown select source")),
+        _ => bail!("unknown select source"),
     }?;
 
     Ok(ev)