From 93bc9ec00f463e120b327ce4a6f18f25fb58199d Mon Sep 17 00:00:00 2001
From: Aram Drevekenin <aram@poor.dev>
Date: Thu, 26 Mar 2026 12:48:24 +0100
Subject: [PATCH] fix: do not reset layout selection in layout manager (#4919)

---
 default-plugins/session-manager/src/main.rs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/default-plugins/session-manager/src/main.rs b/default-plugins/session-manager/src/main.rs
index c4ad26fb1..afade742e 100644
--- a/default-plugins/session-manager/src/main.rs
+++ b/default-plugins/session-manager/src/main.rs
@@ -152,8 +152,19 @@ impl ZellijPlugin for State {
                         &self.sessions.session_ui_infos,
                         &self.resurrectable_sessions.all_resurrectable_sessions,
                     );
+                    let previous_selection =
+                        self.single_screen_state.layout_list.selected_layout_index;
+                    let previous_search_term = self
+                        .single_screen_state
+                        .layout_list
+                        .layout_search_term
+                        .clone();
                     self.single_screen_state.layout_list =
                         self.new_session_info.get_layout_list_clone();
+                    self.single_screen_state.layout_list.layout_search_term = previous_search_term;
+                    self.single_screen_state.layout_list.update_search_term();
+                    self.single_screen_state.layout_list.selected_layout_index =
+                        previous_selection.min(self.single_screen_state.layout_list.max_index());
                 }
                 should_render = true;
             },