1 files changed, 16 insertions, 8 deletions

diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp
index 04a392768a..ea049756b7 100644
--- a/editor/plugins/shader_editor_plugin.cpp
+++ b/editor/plugins/shader_editor_plugin.cpp
@@ -149,7 +149,9 @@ void ShaderEditorPlugin::edit(Object *p_object) {
 			}
 		}
 		es.shader_inc = Ref<ShaderInclude>(si);
-		es.shader_editor = memnew(TextShaderEditor);
+		TextShaderEditor *text_shader = memnew(TextShaderEditor);
+		text_shader->get_code_editor()->set_toggle_list_control(left_panel);
+		es.shader_editor = text_shader;
 		es.shader_editor->edit_shader_include(si);
 		shader_tabs->add_child(es.shader_editor);
 	} else {
@@ -166,7 +168,9 @@ void ShaderEditorPlugin::edit(Object *p_object) {
 		if (vs.is_valid()) {
 			es.shader_editor = memnew(VisualShaderEditor);
 		} else {
-			es.shader_editor = memnew(TextShaderEditor);
+			TextShaderEditor *text_shader = memnew(TextShaderEditor);
+			text_shader->get_code_editor()->set_toggle_list_control(left_panel);
+			es.shader_editor = text_shader;
 		}
 		shader_tabs->add_child(es.shader_editor);
 		es.shader_editor->edit_shader(es.shader);
@@ -434,6 +438,10 @@ void ShaderEditorPlugin::_close_shader(int p_index) {
 	edited_shaders.remove_at(p_index);
 	_update_shader_list();
 	EditorUndoRedoManager::get_singleton()->clear_history(); // To prevent undo on deleted graphs.
+
+	if (shader_tabs->get_tab_count() == 0) {
+		left_panel->show(); // Make sure the panel is visible, because it can't be toggled without open shaders.
+	}
 }
 
 void ShaderEditorPlugin::_close_builtin_shaders_from_scene(const String &p_scene) {
@@ -768,10 +776,10 @@ ShaderEditorPlugin::ShaderEditorPlugin() {
 	Ref<Shortcut> make_floating_shortcut = ED_SHORTCUT_AND_COMMAND("shader_editor/make_floating", TTR("Make Floating"));
 	window_wrapper->set_wrapped_control(main_split, make_floating_shortcut);
 
-	VBoxContainer *vb = memnew(VBoxContainer);
+	left_panel = memnew(VBoxContainer);
 
 	HBoxContainer *menu_hb = memnew(HBoxContainer);
-	vb->add_child(menu_hb);
+	left_panel->add_child(menu_hb);
 	file_menu = memnew(MenuButton);
 	file_menu->set_text(TTR("File"));
 	file_menu->set_shortcut_context(main_split);
@@ -803,14 +811,14 @@ ShaderEditorPlugin::ShaderEditorPlugin() {
 	shader_list = memnew(ItemList);
 	shader_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
 	shader_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	vb->add_child(shader_list);
+	left_panel->add_child(shader_list);
 	shader_list->connect(SceneStringName(item_selected), callable_mp(this, &ShaderEditorPlugin::_shader_selected));
 	shader_list->connect("item_clicked", callable_mp(this, &ShaderEditorPlugin::_shader_list_clicked));
 	shader_list->set_allow_rmb_select(true);
 	SET_DRAG_FORWARDING_GCD(shader_list, ShaderEditorPlugin);
 
-	main_split->add_child(vb);
-	vb->set_custom_minimum_size(Size2(200, 300) * EDSCALE);
+	main_split->add_child(left_panel);
+	left_panel->set_custom_minimum_size(Size2(200, 300) * EDSCALE);
 
 	shader_tabs = memnew(TabContainer);
 	shader_tabs->set_tabs_visible(false);
@@ -823,7 +831,7 @@ ShaderEditorPlugin::ShaderEditorPlugin() {
 	button = EditorNode::get_bottom_panel()->add_item(TTR("Shader Editor"), window_wrapper, ED_SHORTCUT_AND_COMMAND("bottom_panels/toggle_shader_editor_bottom_panel", TTR("Toggle Shader Editor Bottom Panel"), KeyModifierMask::ALT | Key::S));
 
 	shader_create_dialog = memnew(ShaderCreateDialog);
-	vb->add_child(shader_create_dialog);
+	main_split->add_child(shader_create_dialog);
 	shader_create_dialog->connect("shader_created", callable_mp(this, &ShaderEditorPlugin::_shader_created));
 	shader_create_dialog->connect("shader_include_created", callable_mp(this, &ShaderEditorPlugin::_shader_include_created));
 }