From 25e35f079e5147b52a696e72e87df92108febf93 Mon Sep 17 00:00:00 2001
From: akbash <akbash@herdr.dev>
Date: Fri, 21 Aug 2026 22:42:08 +0300
Subject: fix: preserve focus after background worktree removal (#3099)

---
 src/app/worktrees.rs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/app/worktrees.rs')

diff --git a/src/app/worktrees.rs b/src/app/worktrees.rs
index 0087c8fe..414d74b5 100644
--- a/src/app/worktrees.rs
+++ b/src/app/worktrees.rs
@@ -968,6 +968,7 @@ impl App {
     }
 
     pub(crate) fn close_removed_linked_worktree_workspace(&mut self, ws_idx: usize) {
+        let removed_workspace_was_active = self.state.active == Some(ws_idx);
         let parent_key = self
             .state
             .workspaces
@@ -979,6 +980,9 @@ impl App {
         self.state.selected = ws_idx;
         self.state.close_selected_workspace();
 
+        if !removed_workspace_was_active {
+            return;
+        }
         let Some(parent_key) = parent_key else {
             return;
         };
-- 
cgit v1.2.3