diff --git a/src/main.rs b/src/main.rs
index 3cc1452..2f7db99 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -46,8 +46,21 @@ struct Args {
     path: String,
 }
 
+/// Guard that ensures term settings are restored upon program exit
+struct CleanupGuard;
+
+impl Drop for CleanupGuard {
+    fn drop(&mut self) {
+        tui::cleanup();
+    }
+}
+
 #[tokio::main]
 async fn main() -> Result<()> {
+    // Create cleanup guard - will automatically reset term settings
+    // on program exit, even on panic and error
+    let _cleanup = CleanupGuard;
+
     // Parse arguments
     let args = Args::parse();
 
@@ -93,7 +106,6 @@ async fn main() -> Result<()> {
         _ = terminal_events(&mut events, status.clone()) => {}
     }
 
-    ratatui::restore();
     Ok(())
 }
 
diff --git a/src/tui/mod.rs b/src/tui/mod.rs
index f723f11..f2120a8 100644
--- a/src/tui/mod.rs
+++ b/src/tui/mod.rs
@@ -6,6 +6,13 @@ pub use throbbing::Throbbing;
 
 use std::sync::{LazyLock, Mutex};
 
+use crossterm::{cursor, execute};
 use ratatui::DefaultTerminal;
 
 pub static TERMINAL: LazyLock<Mutex<DefaultTerminal>> = LazyLock::new(|| ratatui::init().into());
+
+/// Cleanup function to restore terminal state
+pub fn cleanup() {
+    ratatui::restore();
+    let _ = execute!(std::io::stdout(), cursor::Show);
+}