diff --git a/CodeEdit/Features/Editor/Models/EditorManager.swift b/CodeEdit/Features/Editor/Models/EditorManager.swift
index 4e8eae3493..72b5441d2f 100644
--- a/CodeEdit/Features/Editor/Models/EditorManager.swift
+++ b/CodeEdit/Features/Editor/Models/EditorManager.swift
@@ -101,7 +101,12 @@ class EditorManager: ObservableObject {
     func switchToActiveEditor() {
         cancellable?.cancel()
         cancellable = nil
+
+        // Send the current value immediately so subscribers get the initial state
+        tabBarTabIdSubject.send(activeEditor.selectedTab)
+
         cancellable = activeEditor.$selectedTab
+            .dropFirst() // Avoid duplicate emission since we just sent the current value
             .sink { [weak self] tab in
                 self?.tabBarTabIdSubject.send(tab)
             }