From d7bdd0032e14c2a43e6153d0e326d95335fb9967 Mon Sep 17 00:00:00 2001
From: Dmitry Shilov <dshilov@microsoft.com>
Date: Wed, 4 Jun 2025 11:10:44 +0200
Subject: [PATCH] fix: Activate the last opened React tab after closing active
 tab (#2156)

---
 src/hooks/useTabs.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/hooks/useTabs.ts b/src/hooks/useTabs.ts
index 22f4979c5..257f40ac8 100644
--- a/src/hooks/useTabs.ts
+++ b/src/hooks/useTabs.ts
@@ -103,7 +103,7 @@ export const useTabs: UseStore<TabsState> = create((set, get) => ({
       .forEach((tab) => tab.onCloseTabButtonClick()),
   closeTab: (tab: TabsBase): void => {
     let tabIndex: number;
-    const { activeTab, openedTabs } = get();
+    const { activeTab, openedTabs, openedReactTabs } = get();
     const updatedTabs = openedTabs.filter((openedTab, index) => {
       if (tab.tabId === openedTab.tabId) {
         tabIndex = index;
@@ -127,6 +127,10 @@ export const useTabs: UseStore<TabsState> = create((set, get) => ({
 
     set({ openedTabs: updatedTabs });
 
+    if (updatedTabs.length === 0 && openedReactTabs.length > 0) {
+      set({ activeTab: undefined, activeReactTab: openedReactTabs[openedReactTabs.length - 1] });
+    }
+
     get().persistTabsState();
   },
   closeAllNotebookTabs: (hardClose): void => {