diff --git a/crates/zed2/src/zed2.rs b/crates/zed2/src/zed2.rs
index 5f2099154cc8f298baedceeee3ab282fe8eca079..daa25b8eb95948c2aa281831529c20bd07c6d2d8 100644
--- a/crates/zed2/src/zed2.rs
+++ b/crates/zed2/src/zed2.rs
@@ -11,7 +11,7 @@ use breadcrumbs::Breadcrumbs;
 use collections::VecDeque;
 use editor::{Editor, MultiBuffer};
 use gpui::{
-    actions, point, px, AppContext, Context, FocusableView, PromptLevel, TitlebarOptions,
+    actions, point, px, AppContext, Context, FocusableView, PromptLevel, TitlebarOptions, View,
     ViewContext, VisualContext, WindowBounds, WindowKind, WindowOptions,
 };
 pub use only_instance::*;
@@ -30,6 +30,7 @@ use util::{
     ResultExt,
 };
 use uuid::Uuid;
+use workspace::Pane;
 use workspace::{
     create_and_open_local_file, dock::PanelHandle,
     notifications::simple_message_notification::MessageNotification, open_new, AppState, NewFile,
@@ -92,37 +93,12 @@ pub fn build_window_options(
 pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
     cx.observe_new_views(move |workspace: &mut Workspace, cx| {
         let workspace_handle = cx.view().clone();
+        let center_pane = workspace.active_pane().clone();
+        initialize_pane(workspace, &center_pane, cx);
         cx.subscribe(&workspace_handle, {
             move |workspace, _, event, cx| {
                 if let workspace::Event::PaneAdded(pane) = event {
-                    pane.update(cx, |pane, cx| {
-                        pane.toolbar().update(cx, |toolbar, cx| {
-                            let breadcrumbs = cx.build_view(|_| Breadcrumbs::new(workspace));
-                            toolbar.add_item(breadcrumbs, cx);
-                            let buffer_search_bar = cx.build_view(search::BufferSearchBar::new);
-                            toolbar.add_item(buffer_search_bar.clone(), cx);
-
-                            let quick_action_bar = cx
-                                .build_view(|_| QuickActionBar::new(buffer_search_bar, workspace));
-                            toolbar.add_item(quick_action_bar, cx);
-                            let diagnostic_editor_controls =
-                                cx.build_view(|_| diagnostics::ToolbarControls::new());
-                            //     toolbar.add_item(diagnostic_editor_controls, cx);
-                            //     let project_search_bar = cx.add_view(|_| ProjectSearchBar::new());
-                            //     toolbar.add_item(project_search_bar, cx);
-                            //     let submit_feedback_button =
-                            //         cx.add_view(|_| SubmitFeedbackButton::new());
-                            //     toolbar.add_item(submit_feedback_button, cx);
-                            //     let feedback_info_text = cx.add_view(|_| FeedbackInfoText::new());
-                            //     toolbar.add_item(feedback_info_text, cx);
-                            //     let lsp_log_item =
-                            //         cx.add_view(|_| language_tools::LspLogToolbarItemView::new());
-                            //     toolbar.add_item(lsp_log_item, cx);
-                            //     let syntax_tree_item = cx
-                            //         .add_view(|_| language_tools::SyntaxTreeToolbarItemView::new());
-                            //     toolbar.add_item(syntax_tree_item, cx);
-                        })
-                    });
+                    initialize_pane(workspace, pane, cx);
                 }
             }
         })
@@ -434,6 +410,36 @@ pub fn initialize_workspace(app_state: Arc<AppState>, cx: &mut AppContext) {
     .detach();
 }
 
+fn initialize_pane(workspace: &mut Workspace, pane: &View<Pane>, cx: &mut ViewContext<Workspace>) {
+    pane.update(cx, |pane, cx| {
+        pane.toolbar().update(cx, |toolbar, cx| {
+            let breadcrumbs = cx.build_view(|_| Breadcrumbs::new(workspace));
+            toolbar.add_item(breadcrumbs, cx);
+            let buffer_search_bar = cx.build_view(search::BufferSearchBar::new);
+            toolbar.add_item(buffer_search_bar.clone(), cx);
+
+            let quick_action_bar =
+                cx.build_view(|_| QuickActionBar::new(buffer_search_bar, workspace));
+            toolbar.add_item(quick_action_bar, cx);
+            let diagnostic_editor_controls = cx.build_view(|_| diagnostics::ToolbarControls::new());
+            //     toolbar.add_item(diagnostic_editor_controls, cx);
+            //     let project_search_bar = cx.add_view(|_| ProjectSearchBar::new());
+            //     toolbar.add_item(project_search_bar, cx);
+            //     let submit_feedback_button =
+            //         cx.add_view(|_| SubmitFeedbackButton::new());
+            //     toolbar.add_item(submit_feedback_button, cx);
+            //     let feedback_info_text = cx.add_view(|_| FeedbackInfoText::new());
+            //     toolbar.add_item(feedback_info_text, cx);
+            //     let lsp_log_item =
+            //         cx.add_view(|_| language_tools::LspLogToolbarItemView::new());
+            //     toolbar.add_item(lsp_log_item, cx);
+            //     let syntax_tree_item = cx
+            //         .add_view(|_| language_tools::SyntaxTreeToolbarItemView::new());
+            //     toolbar.add_item(syntax_tree_item, cx);
+        })
+    });
+}
+
 fn about(_: &mut Workspace, _: &About, cx: &mut gpui::ViewContext<Workspace>) {
     use std::fmt::Write as _;