From f99d51e42e2bcb5f18f6eb962a4a08d6b05cceda Mon Sep 17 00:00:00 2001
From: Ogulcan Celik <ogulcancelik@gmail.com>
Date: Tue, 21 Apr 2026 16:56:43 +0300
Subject: fix: close global menu before detach

---
 src/app/input/modal.rs   | 5 ++++-
 src/app/input/sidebar.rs | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/app/input')

diff --git a/src/app/input/modal.rs b/src/app/input/modal.rs
index 2ba9b6f4..fe909326 100644
--- a/src/app/input/modal.rs
+++ b/src/app/input/modal.rs
@@ -121,7 +121,10 @@ pub(super) fn request_quit_or_detach(state: &mut AppState) {
 
 pub(super) fn apply_global_menu_action(state: &mut AppState, action: GlobalMenuAction) {
     match action {
-        GlobalMenuAction::Quit => request_quit_or_detach(state),
+        GlobalMenuAction::Quit => {
+            leave_modal(state);
+            request_quit_or_detach(state);
+        }
         GlobalMenuAction::WhatsNew => open_update_release_notes(state),
         GlobalMenuAction::Keybinds => open_keybind_help(state),
         GlobalMenuAction::ReloadKeybinds => {
diff --git a/src/app/input/sidebar.rs b/src/app/input/sidebar.rs
index 34845861..9de8868b 100644
--- a/src/app/input/sidebar.rs
+++ b/src/app/input/sidebar.rs
@@ -602,6 +602,7 @@ mod tests {
 
         assert!(app.state.detach_requested);
         assert!(!app.state.should_quit);
+        assert_ne!(app.state.mode, Mode::GlobalMenu);
     }
 
     #[test]
-- 
cgit v1.2.3