diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index 5c08482aa4cf..09c14cd1c5d0 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -89,8 +89,14 @@ void SceneTreeDock::_unhandled_key_input(Ref<InputEvent> p_event) {
 		_tool_selected(TOOL_NEW);
 	} else if (ED_IS_SHORTCUT("scene_tree/instance_scene", p_event)) {
 		_tool_selected(TOOL_INSTANCE);
-	} else if (ED_IS_SHORTCUT("scene_tree/expand_collapse_all", p_event)) {
-		_tool_selected(TOOL_EXPAND_COLLAPSE);
+	} else if (ED_IS_SHORTCUT("scene_tree/expand_all", p_event)) {
+		_tool_selected(TOOL_EXPAND_ALL);
+	} else if (ED_IS_SHORTCUT("scene_tree/collapse_all", p_event)) {
+		_tool_selected(TOOL_COLLAPSE_ALL);
+	} else if (ED_IS_SHORTCUT("scene_tree/collapse_all_inactive", p_event)) {
+		_tool_selected(TOOL_COLLAPSE_INACTIVE);
+	} else if (ED_IS_SHORTCUT("scene_tree/expand_collapse_descendants", p_event)) {
+		_tool_selected(TOOL_EXPAND_COLLAPSE_DESCENDANTS);
 	} else if (ED_IS_SHORTCUT("scene_tree/change_node_type", p_event)) {
 		_tool_selected(TOOL_REPLACE);
 	} else if (ED_IS_SHORTCUT("scene_tree/duplicate", p_event)) {
@@ -389,21 +395,29 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			quick_open->set_title(TTR("Instance Child Scene"));
 
 		} break;
-		case TOOL_EXPAND_COLLAPSE: {
+		case TOOL_EXPAND_ALL: {
 
-			if (!scene_tree->get_selected())
-				break;
+			Tree *tree = scene_tree->get_scene_tree();
+			tree->set_collapsed_all(false, false);
+
+		} break;
+		case TOOL_COLLAPSE_ALL: {
 
 			Tree *tree = scene_tree->get_scene_tree();
-			TreeItem *selected_item = tree->get_selected();
+			tree->set_collapsed_all(true, false);
 
-			if (!selected_item)
-				selected_item = tree->get_root();
+		} break;
+		case TOOL_COLLAPSE_INACTIVE: {
 
-			bool collapsed = _is_collapsed_recursive(selected_item);
-			_set_collapsed_recursive(selected_item, !collapsed);
+			Tree *tree = scene_tree->get_scene_tree();
+			tree->set_collapsed_all(true, true);
 
-			tree->ensure_cursor_is_visible();
+		} break;
+		case TOOL_EXPAND_COLLAPSE_DESCENDANTS: {
+
+			Tree *tree = scene_tree->get_scene_tree();
+			TreeItem *selected_item = (!tree->get_selected()) ? tree->get_root() : tree->get_selected();
+			selected_item->toggle_collapsed_all_descendants();
 
 		} break;
 		case TOOL_REPLACE: {
@@ -1024,17 +1038,6 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 	}
 }
 
-void SceneTreeDock::_node_collapsed(Object *p_obj) {
-
-	TreeItem *ti = Object::cast_to<TreeItem>(p_obj);
-	if (!ti)
-		return;
-
-	if (Input::get_singleton()->is_key_pressed(KEY_SHIFT)) {
-		_set_collapsed_recursive(ti, ti->is_collapsed());
-	}
-}
-
 void SceneTreeDock::_notification(int p_what) {
 
 	switch (p_what) {
@@ -1066,7 +1069,6 @@ void SceneTreeDock::_notification(int p_what) {
 			filter->set_clear_button_enabled(true);
 
 			EditorNode::get_singleton()->get_editor_selection()->connect("selection_changed", this, "_selection_changed");
-			scene_tree->get_scene_tree()->connect("item_collapsed", this, "_node_collapsed");
 
 			// create_root_dialog
 			HBoxContainer *top_row = memnew(HBoxContainer);
@@ -1666,52 +1668,6 @@ void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, V
 	editor_data->get_undo_redo().commit_action();
 }
 
-bool SceneTreeDock::_is_collapsed_recursive(TreeItem *p_item) const {
-
-	bool is_branch_collapsed = false;
-
-	List<TreeItem *> needs_check;
-	needs_check.push_back(p_item);
-
-	while (!needs_check.empty()) {
-
-		TreeItem *item = needs_check.back()->get();
-		needs_check.pop_back();
-
-		TreeItem *child = item->get_children();
-		is_branch_collapsed = item->is_collapsed() && child;
-
-		if (is_branch_collapsed) {
-			break;
-		}
-		while (child) {
-			needs_check.push_back(child);
-			child = child->get_next();
-		}
-	}
-	return is_branch_collapsed;
-}
-
-void SceneTreeDock::_set_collapsed_recursive(TreeItem *p_item, bool p_collapsed) {
-
-	List<TreeItem *> to_collapse;
-	to_collapse.push_back(p_item);
-
-	while (!to_collapse.empty()) {
-
-		TreeItem *item = to_collapse.back()->get();
-		to_collapse.pop_back();
-
-		item->set_collapsed(p_collapsed);
-
-		TreeItem *child = item->get_children();
-		while (child) {
-			to_collapse.push_back(child);
-			child = child->get_next();
-		}
-	}
-}
-
 void SceneTreeDock::_script_created(Ref<Script> p_script) {
 
 	List<Node *> selected = editor_selection->get_selected_node_list();
@@ -2386,6 +2342,7 @@ void SceneTreeDock::_add_children_to_popup(Object *p_obj, int p_depth) {
 
 void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 
+	// No edited scene -> This can happen?
 	if (!EditorNode::get_singleton()->get_edited_scene()) {
 
 		menu->clear();
@@ -2400,51 +2357,68 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 		return;
 	}
 
+	// Standard Menu
 	List<Node *> selection = editor_selection->get_selected_node_list();
-	List<Node *> full_selection = editor_selection->get_full_selected_node_list(); // Above method only returns nodes with common parent.
-
 	if (selection.size() == 0)
 		return;
 
+	List<Node *> full_selection = editor_selection->get_full_selected_node_list(); // Above method only returns nodes with common parent.
 	menu->clear();
 
-	Ref<Script> existing_script;
-	bool exisiting_script_removable = true;
-	if (selection.size() == 1) {
+	if (selection.size() == 1 && profile_allow_editing) {
 
-		Node *selected = selection[0];
+		// Sub-Ressources Section
+		subresources.clear();
+		menu_subresources->clear();
+		menu_subresources->set_size(Size2(1, 1));
 
-		if (profile_allow_editing) {
-			subresources.clear();
-			menu_subresources->clear();
-			menu_subresources->set_size(Size2(1, 1));
-			_add_children_to_popup(selection.front()->get(), 0);
-			if (menu->get_item_count() > 0)
-				menu->add_separator();
+		_add_children_to_popup(selection.front()->get(), 0);
 
-			menu->add_icon_shortcut(get_icon("Add", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/add_child_node"), TOOL_NEW);
-			menu->add_icon_shortcut(get_icon("Instance", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/instance_scene"), TOOL_INSTANCE);
+		if (menu->get_item_count() > 0) {
+			menu->add_separator();
 		}
-		menu->add_icon_shortcut(get_icon("Collapse", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/expand_collapse_all"), TOOL_EXPAND_COLLAPSE);
-		menu->add_separator();
-
-		existing_script = selected->get_script();
 
-		if (EditorNode::get_singleton()->get_object_custom_type_base(selected) == existing_script) {
-			exisiting_script_removable = false;
-		}
+		// Node Manipulation Section
+		menu->add_icon_shortcut(get_icon("Add", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/add_child_node"), TOOL_NEW);
+		menu->add_icon_shortcut(get_icon("Instance", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/instance_scene"), TOOL_INSTANCE);
+		menu->add_icon_shortcut(get_icon("Blend", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/merge_from_scene"), TOOL_MERGE_FROM_SCENE);
+		menu->add_icon_shortcut(get_icon("CreateNewSceneFrom", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/save_branch_as_scene"), TOOL_NEW_SCENE_FROM);
+		menu->add_icon_shortcut(get_icon("Reload", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/change_node_type"), TOOL_REPLACE);
+		menu->add_separator();
 	}
 
+	// Collapse/Expand Section
+	menu->add_icon_shortcut(get_icon("AnimationTrackGroup", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/expand_all"), TOOL_EXPAND_ALL);
+	menu->add_icon_shortcut(get_icon("AnimationTrackList", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/collapse_all"), TOOL_COLLAPSE_ALL);
+	menu->add_icon_shortcut(get_icon("Collapse", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/collapse_all_inactive"), TOOL_COLLAPSE_INACTIVE); // Only works for first selected item. TODO: FIX!
+	menu->add_icon_shortcut(get_icon("Collapse", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/expand_collapse_descendants"), TOOL_EXPAND_COLLAPSE_DESCENDANTS);
+	menu->add_separator();
+
+	// Script Section
 	if (profile_allow_script_editing) {
+
 		bool add_separator = false;
+		Ref<Script> existing_script;
+		bool exisiting_script_removable = true;
+
+		if (selection.size() == 1) {
+			Node *selected = selection[0];
+			existing_script = selected->get_script();
+
+			if (EditorNode::get_singleton()->get_object_custom_type_base(selected) == existing_script) {
+				exisiting_script_removable = false;
+			}
+		}
 
 		if (full_selection.size() == 1) {
 			add_separator = true;
 			menu->add_icon_shortcut(get_icon("ScriptCreate", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/attach_script"), TOOL_ATTACH_SCRIPT);
+
 			if (existing_script.is_valid()) {
 				menu->add_icon_shortcut(get_icon("ScriptExtend", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/extend_script"), TOOL_EXTEND_SCRIPT);
 			}
 		}
+
 		if (existing_script.is_valid() && exisiting_script_removable) {
 			add_separator = true;
 			menu->add_icon_shortcut(get_icon("ScriptRemove", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/clear_script"), TOOL_CLEAR_SCRIPT);
@@ -2468,14 +2442,19 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 		}
 	}
 
+	// TreeItem Manipulation Section
 	if (profile_allow_editing) {
+
 		if (full_selection.size() == 1) {
 			menu->add_icon_shortcut(get_icon("Rename", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/rename"), TOOL_RENAME);
+			menu->add_separator();
+		} else if (selection.size() > 1) {
+			// this should be in the same section as the usual single item rename
+			menu->add_icon_shortcut(get_icon("Rename", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/batch_rename"), TOOL_BATCH_RENAME);
+			menu->add_separator();
 		}
-		menu->add_icon_shortcut(get_icon("Reload", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/change_node_type"), TOOL_REPLACE);
 
 		if (scene_tree->get_selected() != edited_scene) {
-			menu->add_separator();
 			menu->add_icon_shortcut(get_icon("MoveUp", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/move_up"), TOOL_MOVE_UP);
 			menu->add_icon_shortcut(get_icon("MoveDown", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/move_down"), TOOL_MOVE_DOWN);
 			menu->add_icon_shortcut(get_icon("Duplicate", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/duplicate"), TOOL_DUPLICATE);
@@ -2484,60 +2463,53 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) {
 			if (selection.size() == 1) {
 				menu->add_icon_shortcut(get_icon("NewRoot", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/make_root"), TOOL_MAKE_ROOT);
 			}
+			menu->add_separator();
 		}
 	}
-	if (selection.size() == 1) {
 
-		if (profile_allow_editing) {
-			menu->add_separator();
-			menu->add_icon_shortcut(get_icon("Blend", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/merge_from_scene"), TOOL_MERGE_FROM_SCENE);
-			menu->add_icon_shortcut(get_icon("CreateNewSceneFrom", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/save_branch_as_scene"), TOOL_NEW_SCENE_FROM);
-		}
-		if (full_selection.size() == 1) {
+	// Is-External Section
+	if (selection.size() == 1 && selection[0]->get_filename() != "") {
+
+		bool is_inherited = selection[0]->get_scene_inherited_state() != NULL;
+		bool is_top_level = selection[0]->get_owner() == NULL;
+
+		if (is_inherited && is_top_level) {
+			if (profile_allow_editing) {
+				menu->add_item(TTR("Clear Inheritance"), TOOL_SCENE_CLEAR_INHERITANCE);
+			}
+			menu->add_icon_item(get_icon("Load", "EditorIcons"), TTR("Open in Editor"), TOOL_SCENE_OPEN_INHERITED);
 			menu->add_separator();
-			menu->add_icon_shortcut(get_icon("CopyNodePath", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/copy_node_path"), TOOL_COPY_NODE_PATH);
-		}
+		} else if (!is_top_level) {
+			bool editable = EditorNode::get_singleton()->get_edited_scene()->is_editable_instance(selection[0]);
+			bool placeholder = selection[0]->get_scene_instance_load_placeholder();
 
-		bool is_external = (selection[0]->get_filename() != "");
-		if (is_external) {
-			bool is_inherited = selection[0]->get_scene_inherited_state() != NULL;
-			bool is_top_level = selection[0]->get_owner() == NULL;
-			if (is_inherited && is_top_level) {
-				menu->add_separator();
-				if (profile_allow_editing) {
-					menu->add_item(TTR("Clear Inheritance"), TOOL_SCENE_CLEAR_INHERITANCE);
-				}
-				menu->add_icon_item(get_icon("Load", "EditorIcons"), TTR("Open in Editor"), TOOL_SCENE_OPEN_INHERITED);
-			} else if (!is_top_level) {
-				menu->add_separator();
-				bool editable = EditorNode::get_singleton()->get_edited_scene()->is_editable_instance(selection[0]);
-				bool placeholder = selection[0]->get_scene_instance_load_placeholder();
-				if (profile_allow_editing) {
-					menu->add_check_item(TTR("Editable Children"), TOOL_SCENE_EDITABLE_CHILDREN);
-					menu->add_check_item(TTR("Load As Placeholder"), TOOL_SCENE_USE_PLACEHOLDER);
-					menu->add_item(TTR("Make Local"), TOOL_SCENE_MAKE_LOCAL);
-				}
-				menu->add_icon_item(get_icon("Load", "EditorIcons"), TTR("Open in Editor"), TOOL_SCENE_OPEN);
-				if (profile_allow_editing) {
-					menu->set_item_checked(menu->get_item_idx_from_text(TTR("Editable Children")), editable);
-					menu->set_item_checked(menu->get_item_idx_from_text(TTR("Load As Placeholder")), placeholder);
-				}
+			if (profile_allow_editing) {
+				menu->add_check_item(TTR("Editable Children"), TOOL_SCENE_EDITABLE_CHILDREN);
+				menu->add_check_item(TTR("Load As Placeholder"), TOOL_SCENE_USE_PLACEHOLDER);
+				menu->add_item(TTR("Make Local"), TOOL_SCENE_MAKE_LOCAL);
 			}
+
+			menu->add_icon_item(get_icon("Load", "EditorIcons"), TTR("Open in Editor"), TOOL_SCENE_OPEN);
+
+			if (profile_allow_editing) {
+				menu->set_item_checked(menu->get_item_idx_from_text(TTR("Editable Children")), editable);
+				menu->set_item_checked(menu->get_item_idx_from_text(TTR("Load As Placeholder")), placeholder);
+			}
+			menu->add_separator();
 		}
 	}
 
-	if (profile_allow_editing && selection.size() > 1) {
-		//this is not a commonly used action, it makes no sense for it to be where it was nor always present.
-		menu->add_separator();
-		menu->add_icon_shortcut(get_icon("Rename", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/batch_rename"), TOOL_BATCH_RENAME);
-	}
-	menu->add_separator();
+	// Information Section
+	menu->add_icon_shortcut(get_icon("CopyNodePath", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/copy_node_path"), TOOL_COPY_NODE_PATH);
 	menu->add_icon_item(get_icon("Help", "EditorIcons"), TTR("Open Documentation"), TOOL_OPEN_DOCUMENTATION);
+	menu->add_separator();
 
+	// Destructive operation section
 	if (profile_allow_editing) {
-		menu->add_separator();
 		menu->add_icon_shortcut(get_icon("Remove", "EditorIcons"), ED_SHORTCUT("scene_tree/delete", TTR("Delete Node(s)"), KEY_DELETE), TOOL_ERASE);
 	}
+
+	// Menu setup
 	menu->set_size(Size2(1, 1));
 	menu->set_position(p_menu_pos);
 	menu->popup();
@@ -2790,7 +2762,6 @@ void SceneTreeDock::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_node_prerenamed"), &SceneTreeDock::_node_prerenamed);
 	ClassDB::bind_method(D_METHOD("_import_subscene"), &SceneTreeDock::_import_subscene);
 	ClassDB::bind_method(D_METHOD("_selection_changed"), &SceneTreeDock::_selection_changed);
-	ClassDB::bind_method(D_METHOD("_node_collapsed"), &SceneTreeDock::_node_collapsed);
 	ClassDB::bind_method(D_METHOD("_new_scene_from"), &SceneTreeDock::_new_scene_from);
 	ClassDB::bind_method(D_METHOD("_nodes_dragged"), &SceneTreeDock::_nodes_dragged);
 	ClassDB::bind_method(D_METHOD("_files_dropped"), &SceneTreeDock::_files_dropped);
@@ -2831,7 +2802,10 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor, Node *p_scene_root, EditorSel
 	ED_SHORTCUT("scene_tree/batch_rename", TTR("Batch Rename"), KEY_MASK_CMD | KEY_F2);
 	ED_SHORTCUT("scene_tree/add_child_node", TTR("Add Child Node"), KEY_MASK_CMD | KEY_A);
 	ED_SHORTCUT("scene_tree/instance_scene", TTR("Instance Child Scene"));
-	ED_SHORTCUT("scene_tree/expand_collapse_all", TTR("Expand/Collapse All"));
+	ED_SHORTCUT("scene_tree/expand_all", TTR("Expand All"));
+	ED_SHORTCUT("scene_tree/collapse_all", TTR("Collapse All"));
+	ED_SHORTCUT("scene_tree/collapse_all_inactive", TTR("Collapse Unselected"));
+	ED_SHORTCUT("scene_tree/expand_collapse_descendants", TTR("Expand/Collapse Descendants"));
 	ED_SHORTCUT("scene_tree/change_node_type", TTR("Change Type"));
 	ED_SHORTCUT("scene_tree/attach_script", TTR("Attach Script"));
 	ED_SHORTCUT("scene_tree/extend_script", TTR("Extend Script"));
diff --git a/editor/scene_tree_dock.h b/editor/scene_tree_dock.h
index 56fbb868246f..830a51dabe23 100644
--- a/editor/scene_tree_dock.h
+++ b/editor/scene_tree_dock.h
@@ -60,7 +60,10 @@ class SceneTreeDock : public VBoxContainer {
 
 		TOOL_NEW,
 		TOOL_INSTANCE,
-		TOOL_EXPAND_COLLAPSE,
+		TOOL_EXPAND_ALL,
+		TOOL_COLLAPSE_ALL,
+		TOOL_COLLAPSE_INACTIVE,
+		TOOL_EXPAND_COLLAPSE_DESCENDANTS,
 		TOOL_RENAME,
 		TOOL_BATCH_RENAME,
 		TOOL_REPLACE,
@@ -121,7 +124,6 @@ class SceneTreeDock : public VBoxContainer {
 
 	HBoxContainer *tool_hbc;
 	void _tool_selected(int p_tool, bool p_confirm_override = false);
-	void _node_collapsed(Object *p_obj);
 
 	EditorData *editor_data;
 	EditorSelection *editor_selection;
@@ -160,9 +162,6 @@ class SceneTreeDock : public VBoxContainer {
 	void _node_reparent(NodePath p_path, bool p_keep_global_xform);
 	void _do_reparent(Node *p_new_parent, int p_position_in_parent, Vector<Node *> p_nodes, bool p_keep_global_xform);
 
-	bool _is_collapsed_recursive(TreeItem *p_item) const;
-	void _set_collapsed_recursive(TreeItem *p_item, bool p_collapsed);
-
 	void _set_owners(Node *p_owner, const Array &p_nodes);
 
 	enum ReplaceOwnerMode {
@@ -221,8 +220,6 @@ class SceneTreeDock : public VBoxContainer {
 	void _perform_instance_scenes(const Vector<String> &p_files, Node *parent, int p_pos);
 	void _replace_with_branch_scene(const String &p_file, Node *base);
 
-	void _file_selected(String p_file);
-
 	void _remote_tree_selected();
 	void _local_tree_selected();
 
diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp
index d479a1636ab8..f3647a202ed3 100644
--- a/scene/gui/tree.cpp
+++ b/scene/gui/tree.cpp
@@ -276,6 +276,7 @@ bool TreeItem::is_range_exponential(int p_column) const {
 	ERR_FAIL_INDEX_V(p_column, cells.size(), false);
 	return cells[p_column].expr;
 }
+
 void TreeItem::set_range_config(int p_column, double p_min, double p_max, double p_step, bool p_exp) {
 
 	ERR_FAIL_INDEX(p_column, cells.size());
@@ -320,7 +321,9 @@ void TreeItem::set_collapsed(bool p_collapsed) {
 
 	if (collapsed == p_collapsed || !tree)
 		return;
+
 	collapsed = p_collapsed;
+
 	TreeItem *ci = tree->selected_item;
 	if (ci) {
 
@@ -347,6 +350,48 @@ void TreeItem::set_collapsed(bool p_collapsed) {
 	tree->emit_signal("item_collapsed", this);
 }
 
+void TreeItem::set_collapsed_recursive(bool p_collapsed, bool p_ignore_active, bool p_skip_self) {
+
+	if (!tree) {
+		return;
+	}
+
+	if (p_skip_self || (p_ignore_active && this->is_active())) {
+		// Ignore current item, collapse recursively all children.
+		TreeItem *c = get_children();
+		while (c) {
+			c->set_collapsed_recursive(p_collapsed, p_ignore_active, false);
+			c = c->get_next();
+		}
+	} else {
+		// Set collapsed state on self and all children recursively.
+		const Variant arg_collapsed[] = { Variant(p_collapsed) };
+		const Variant *args[] = { arg_collapsed };
+		Variant::CallError error;
+		call_recursive("set_collapsed", args, 1, error);
+	}
+}
+
+void TreeItem::toggle_collapsed_all_descendants() {
+	if (is_collapsed()) {
+		// Expand recursively.
+		set_collapsed_recursive(false, false, false);
+	} else {
+		// Collapse/Expand all children.
+		bool child_expanded = false;
+		TreeItem *c = get_children();
+		while (c) {
+			if (!c->is_collapsed()) {
+				child_expanded = true;
+				break;
+			}
+			c = c->get_next();
+		}
+
+		set_collapsed_recursive(child_expanded, false, true);
+	}
+}
+
 bool TreeItem::is_collapsed() {
 
 	return collapsed;
@@ -498,6 +543,26 @@ bool TreeItem::is_selected(int p_column) {
 	return cells[p_column].selectable && cells[p_column].selected;
 }
 
+bool TreeItem::is_active() {
+
+	TreeItem *selected = tree->get_selected();
+	if (!selected) {
+		return false;
+	} else if (selected == this) {
+		return true;
+	}
+
+	TreeItem *c = this->get_children();
+	while (c) {
+		if (c->is_active()) {
+			return true;
+		}
+		c = c->get_next();
+	}
+
+	return false;
+}
+
 void TreeItem::set_as_cursor(int p_column) {
 
 	ERR_FAIL_INDEX(p_column, cells.size());
@@ -542,21 +607,25 @@ int TreeItem::get_button_count(int p_column) const {
 	ERR_FAIL_INDEX_V(p_column, cells.size(), -1);
 	return cells[p_column].buttons.size();
 }
+
 Ref<Texture> TreeItem::get_button(int p_column, int p_idx) const {
 	ERR_FAIL_INDEX_V(p_column, cells.size(), Ref<Texture>());
 	ERR_FAIL_INDEX_V(p_idx, cells[p_column].buttons.size(), Ref<Texture>());
 	return cells[p_column].buttons[p_idx].texture;
 }
+
 String TreeItem::get_button_tooltip(int p_column, int p_idx) const {
 	ERR_FAIL_INDEX_V(p_column, cells.size(), String());
 	ERR_FAIL_INDEX_V(p_idx, cells[p_column].buttons.size(), String());
 	return cells[p_column].buttons[p_idx].tooltip;
 }
+
 int TreeItem::get_button_id(int p_column, int p_idx) const {
 	ERR_FAIL_INDEX_V(p_column, cells.size(), -1);
 	ERR_FAIL_INDEX_V(p_idx, cells[p_column].buttons.size(), -1);
 	return cells[p_column].buttons[p_idx].id;
 }
+
 void TreeItem::erase_button(int p_column, int p_idx) {
 
 	ERR_FAIL_INDEX(p_column, cells.size());
@@ -631,6 +700,7 @@ void TreeItem::set_custom_color(int p_column, const Color &p_color) {
 	cells.write[p_column].color = p_color;
 	_changed_notify(p_column);
 }
+
 Color TreeItem::get_custom_color(int p_column) const {
 
 	ERR_FAIL_INDEX_V(p_column, cells.size(), Color());
@@ -638,6 +708,7 @@ Color TreeItem::get_custom_color(int p_column) const {
 		return Color();
 	return cells[p_column].color;
 }
+
 void TreeItem::clear_custom_color(int p_column) {
 
 	ERR_FAIL_INDEX(p_column, cells.size());
@@ -800,6 +871,8 @@ void TreeItem::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_custom_draw", "column", "object", "callback"), &TreeItem::set_custom_draw);
 
 	ClassDB::bind_method(D_METHOD("set_collapsed", "enable"), &TreeItem::set_collapsed);
+	ClassDB::bind_method(D_METHOD("set_collapsed_recursive", "enable", "ignore_active", "ignore_self"), &TreeItem::set_collapsed_recursive);
+	ClassDB::bind_method(D_METHOD("toggle_collapsed_all_descendants"), &TreeItem::toggle_collapsed_all_descendants);
 	ClassDB::bind_method(D_METHOD("is_collapsed"), &TreeItem::is_collapsed);
 
 	ClassDB::bind_method(D_METHOD("set_custom_minimum_height", "height"), &TreeItem::set_custom_minimum_height);
@@ -819,6 +892,7 @@ void TreeItem::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_selectable", "column"), &TreeItem::is_selectable);
 
 	ClassDB::bind_method(D_METHOD("is_selected", "column"), &TreeItem::is_selected);
+	ClassDB::bind_method(D_METHOD("is_active"), &TreeItem::is_active);
 	ClassDB::bind_method(D_METHOD("select", "column"), &TreeItem::select);
 	ClassDB::bind_method(D_METHOD("deselect", "column"), &TreeItem::deselect);
 
@@ -1558,6 +1632,7 @@ int Tree::_count_selected_items(TreeItem *p_from) const {
 
 	return count;
 }
+
 void Tree::select_single_item(TreeItem *p_selected, TreeItem *p_current, int p_col, TreeItem *p_prev, bool *r_in_range, bool p_force_deselect) {
 
 	TreeItem::Cell &selected_cell = p_selected->cells.write[p_col];
@@ -1674,7 +1749,6 @@ void Tree::_range_click_timeout() {
 		click_handled = false;
 		Ref<InputEventMouseButton> mb;
 		mb.instance();
-		;
 
 		propagate_mouse_activated = false; // done from outside, so signal handler can't clear the tree in the middle of emit (which is a common case)
 		blocked++;
@@ -1713,10 +1787,17 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, bool
 			return -1;
 		}
 
+		// Clicked on folding arrow
 		if (!p_item->disable_folding && !hide_folding && (p_pos.x >= x_ofs && p_pos.x < (x_ofs + cache.item_margin))) {
-
-			if (p_item->children)
-				p_item->set_collapsed(!p_item->is_collapsed());
+			// No point in collapsing if there are no children.
+			if (p_item->get_children()) {
+				// ALT or equivalent is held, change collapse behavior.
+				if (Input::get_singleton()->is_key_pressed(KEY_ALT)) {
+					p_item->toggle_collapsed_all_descendants();
+				} else {
+					p_item->set_collapsed(!p_item->is_collapsed());
+				}
+			}
 
 			return -1; //handled!
 		}
@@ -1765,7 +1846,12 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, bool
 		}
 
 		if (!p_item->disable_folding && !hide_folding && !p_item->cells[col].editable && !p_item->cells[col].selectable && p_item->get_children()) {
-			p_item->set_collapsed(!p_item->is_collapsed());
+			// ALT or equivalent is held, change collapse behavior.
+			if (Input::get_singleton()->is_key_pressed(KEY_ALT)) {
+				p_item->toggle_collapsed_all_descendants();
+			} else {
+				p_item->set_collapsed(!p_item->is_collapsed());
+			}
 			return -1; //collapse/uncollapse because nothing can be done with item
 		}
 
@@ -3135,6 +3221,7 @@ TreeItem *Tree::get_root() {
 
 	return root;
 }
+
 TreeItem *Tree::get_last_item() {
 
 	TreeItem *last = root;
@@ -3269,6 +3356,7 @@ void Tree::set_column_min_width(int p_column, int p_min_width) {
 	columns.write[p_column].min_width = p_min_width;
 	update();
 }
+
 void Tree::set_column_expand(int p_column, bool p_expand) {
 
 	ERR_FAIL_INDEX(p_column, columns.size());
@@ -3731,6 +3819,7 @@ int Tree::get_drop_section_at_position(const Point2 &p_pos) const {
 
 	return -100;
 }
+
 TreeItem *Tree::get_item_at_position(const Point2 &p_pos) const {
 
 	if (root) {
@@ -3872,6 +3961,12 @@ bool Tree::get_allow_reselect() const {
 	return allow_reselect;
 }
 
+void Tree::set_collapsed_all(bool p_collapsed, bool p_ignore_active) {
+
+	get_root()->set_collapsed_recursive(p_collapsed, p_ignore_active, false);
+	ensure_cursor_is_visible();
+}
+
 void Tree::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("_range_click_timeout"), &Tree::_range_click_timeout);
@@ -3931,6 +4026,8 @@ void Tree::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_allow_reselect", "allow"), &Tree::set_allow_reselect);
 	ClassDB::bind_method(D_METHOD("get_allow_reselect"), &Tree::get_allow_reselect);
 
+	ClassDB::bind_method(D_METHOD("set_collapsed_all", "collapsed", "ignore_active"), &Tree::set_collapsed_all);
+
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "columns"), "set_columns", "get_columns");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_reselect"), "set_allow_reselect", "get_allow_reselect");
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "allow_rmb_select"), "set_allow_rmb_select", "get_allow_rmb_select");
diff --git a/scene/gui/tree.h b/scene/gui/tree.h
index d5227f6e654e..139a755b51c2 100644
--- a/scene/gui/tree.h
+++ b/scene/gui/tree.h
@@ -228,6 +228,8 @@ class TreeItem : public Object {
 	void set_custom_draw(int p_column, Object *p_object, const StringName &p_callback);
 
 	void set_collapsed(bool p_collapsed);
+	void set_collapsed_recursive(bool p_collapsed, bool p_ignore_active, bool p_skip_self);
+	void toggle_collapsed_all_descendants();
 	bool is_collapsed();
 
 	void set_custom_minimum_height(int p_height);
@@ -247,6 +249,7 @@ class TreeItem : public Object {
 	bool is_selectable(int p_column) const;
 
 	bool is_selected(int p_column);
+	bool is_active();
 	void select(int p_column);
 	void deselect(int p_column);
 	void set_as_cursor(int p_column);
@@ -602,6 +605,8 @@ class Tree : public Control {
 	void set_allow_reselect(bool p_allow);
 	bool get_allow_reselect() const;
 
+	void set_collapsed_all(bool p_collapsed, bool p_ignore_active);
+
 	Tree();
 	~Tree();
 };