diff --git a/Cargo.lock b/Cargo.lock
index a91c63d..da8f976 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1324,7 +1324,7 @@ dependencies = [
 
 [[package]]
 name = "jocalsend"
-version = "0.1.0"
+version = "1.0.0"
 dependencies = [
  "axum",
  "axum-server",
diff --git a/Cargo.toml b/Cargo.toml
index 229cb3b..61cd231 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jocalsend"
-version = "0.1.0"
+version = "1.0.0"
 edition = "2024"
 
 [dependencies]
diff --git a/src/app/mod.rs b/src/app/mod.rs
index 4f21a36..e1debe5 100644
--- a/src/app/mod.rs
+++ b/src/app/mod.rs
@@ -134,7 +134,7 @@ impl App {
             | CurrentScreen::Sending(SendingScreen::Files)
             | CurrentScreen::Sending(SendingScreen::Peers) => match code {
                 KeyCode::Esc => self.pop(),
-                KeyCode::Char('q') => self.exit(),
+                KeyCode::Char('q') => self.exit().await,
                 KeyCode::Char('s') => self.send(),
                 KeyCode::Char('r') => self.recv(),
                 KeyCode::Char('l') => self.logs(),
@@ -206,8 +206,9 @@ impl App {
         frame.render_widget(self, frame.area());
     }
 
-    pub fn exit(&mut self) {
+    pub async fn exit(&mut self) {
         self.screen.push(CurrentScreen::Stopping);
+        self.service.stop().await;
     }
 
     pub fn send(&mut self) {
diff --git a/src/app/widgets.rs b/src/app/widgets.rs
index 512ea6d..3b1b43b 100644
--- a/src/app/widgets.rs
+++ b/src/app/widgets.rs
@@ -136,7 +136,7 @@ impl Widget for &mut App {
         // one element in `self.screen`; see the `self.pop()` method
         let current_screen = self.screen();
         match current_screen {
-            CurrentScreen::Main => {
+            CurrentScreen::Main | CurrentScreen::Stopping => {
                 let rx_reqs: Vec<_> = self.receive_requests.values().collect();
                 outer_frame(&current_screen, &MAIN_MENU, area, buf);
                 logger(header_right.inner(header_margin), buf);
@@ -213,9 +213,6 @@ impl Widget for &mut App {
                     // function
                 }
             }
-            _ => {
-                outer_frame(&current_screen, &MAIN_MENU, area, buf);
-            }
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
index f8049d7..d23eaaf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -64,7 +64,6 @@ async fn start_and_run(terminal: &mut DefaultTerminal, config: Config) -> Result
         app.handle_events().await?;
 
         if app.screen() == CurrentScreen::Stopping {
-            app.service.stop().await;
             break;
         }
 
@@ -128,11 +127,17 @@ fn set_file_selection(path: &Path, explorer: &mut FileExplorer) {
         let parent = path.parent().map(|f| f.to_path_buf()).unwrap_or("/".into());
         let _ = explorer.set_cwd(parent);
     };
-    let files = explorer.files().clone();
+
+    let files = explorer.files();
+    let mut idx = None;
     for (i, f) in files.iter().enumerate() {
         if f.name() == path.file_name().unwrap().to_string_lossy() {
-            explorer.set_selected_idx(i);
+            idx = Some(i);
             break;
         }
     }
+
+    if let Some(idx) = idx {
+        explorer.set_selected_idx(idx);
+    }
 }