From b6a5251dc7f0431046ef43ae369f7555f8261e9f Mon Sep 17 00:00:00 2001
From: Kulratan Thapar <kulratan.thapar97@gmail.com>
Date: Wed, 18 Feb 2026 15:01:31 +0000
Subject: [PATCH 1/4] Upgrade

---
 .../layout/utility_types/layout_widget.rs     |  6 ++
 .../node_graph/document_node_definitions.rs   |  1 +
 .../document/node_graph/node_properties.rs    |  8 +++
 .../properties_panel_message.rs               |  2 +
 .../properties_panel_message_handler.rs       | 17 ++++-
 .../components/widgets/WidgetSection.svelte   | 15 ++++-
 frontend/src/messages.ts                      | 67 ++++++++++---------
 frontend/wasm/src/editor_api.rs               | 14 ++++
 8 files changed, 93 insertions(+), 37 deletions(-)

diff --git a/editor/src/messages/layout/utility_types/layout_widget.rs b/editor/src/messages/layout/utility_types/layout_widget.rs
index fef1061f27..02302290d7 100644
--- a/editor/src/messages/layout/utility_types/layout_widget.rs
+++ b/editor/src/messages/layout/utility_types/layout_widget.rs
@@ -340,6 +340,7 @@ pub enum LayoutGroup {
 		description: String,
 		visible: bool,
 		pinned: bool,
+		expanded: bool,
 		id: u64,
 		layout: Layout,
 	},
@@ -439,6 +440,7 @@ impl Diffable for LayoutGroup {
 					description: current_description,
 					visible: current_visible,
 					pinned: current_pinned,
+					expanded: current_expanded,
 					id: current_id,
 					layout: current_layout,
 				},
@@ -447,6 +449,7 @@ impl Diffable for LayoutGroup {
 					description: new_description,
 					visible: new_visible,
 					pinned: new_pinned,
+					expanded: new_expanded,
 					id: new_id,
 					layout: new_layout,
 				},
@@ -458,6 +461,7 @@ impl Diffable for LayoutGroup {
 					|| *current_description != new_description
 					|| *current_visible != new_visible
 					|| *current_pinned != new_pinned
+					|| *current_expanded != new_expanded
 					|| *current_id != new_id
 				{
 					// Update self to reflect new changes
@@ -465,6 +469,7 @@ impl Diffable for LayoutGroup {
 					current_description.clone_from(&new_description);
 					*current_visible = new_visible;
 					*current_pinned = new_pinned;
+					*current_expanded = new_expanded;
 					*current_id = new_id;
 					current_layout.clone_from(&new_layout);
 
@@ -474,6 +479,7 @@ impl Diffable for LayoutGroup {
 						description: new_description,
 						visible: new_visible,
 						pinned: new_pinned,
+						expanded: new_expanded,
 						id: new_id,
 						layout: new_layout,
 					}
diff --git a/editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs b/editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs
index 1f72162800..3e3c79d0a1 100644
--- a/editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs
+++ b/editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs
@@ -35,6 +35,7 @@ pub struct NodePropertiesContext<'a> {
 	pub network_interface: &'a mut NodeNetworkInterface,
 	pub selection_network_path: &'a [NodeId],
 	pub document_name: &'a str,
+	pub section_expanded: &'a HashMap<u64, bool>,
 }
 
 impl NodePropertiesContext<'_> {
diff --git a/editor/src/messages/portfolio/document/node_graph/node_properties.rs b/editor/src/messages/portfolio/document/node_graph/node_properties.rs
index eb08935e7c..24e8f827e8 100644
--- a/editor/src/messages/portfolio/document/node_graph/node_properties.rs
+++ b/editor/src/messages/portfolio/document/node_graph/node_properties.rs
@@ -1843,12 +1843,20 @@ pub(crate) fn generate_node_properties(node_id: NodeId, context: &mut NodeProper
 
 	let visible = context.network_interface.is_visible(&node_id, context.selection_network_path);
 	let pinned = context.network_interface.is_pinned(&node_id, context.selection_network_path);
+	let is_merge_node = context
+		.network_interface
+		.reference(&node_id, context.selection_network_path)
+		.as_ref()
+		.is_some_and(|id| id.implementation_name_from_identifier() == "Merge");
+	let default_expanded = !is_merge_node;
+	let expanded = context.section_expanded.get(&node_id.0).copied().unwrap_or(default_expanded);
 
 	LayoutGroup::Section {
 		name,
 		description,
 		visible,
 		pinned,
+		expanded,
 		id: node_id.0,
 		layout: Layout(layout),
 	}
diff --git a/editor/src/messages/portfolio/document/properties_panel/properties_panel_message.rs b/editor/src/messages/portfolio/document/properties_panel/properties_panel_message.rs
index a87d8fb07d..954c909dee 100644
--- a/editor/src/messages/portfolio/document/properties_panel/properties_panel_message.rs
+++ b/editor/src/messages/portfolio/document/properties_panel/properties_panel_message.rs
@@ -6,4 +6,6 @@ pub enum PropertiesPanelMessage {
 	// Messages
 	Clear,
 	Refresh,
+	SetAllSectionsExpanded { expanded: bool },
+	SetSectionExpanded { node_id: u64, expanded: bool },
 }
diff --git a/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs b/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs
index b5706ec1e5..1665c94cf5 100644
--- a/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs
+++ b/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs
@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use graphene_std::uuid::NodeId;
 
 use crate::messages::layout::utility_types::widget_prelude::*;
@@ -18,7 +20,9 @@ pub struct PropertiesPanelMessageContext<'a> {
 }
 
 #[derive(Debug, Clone, Default, ExtractField)]
-pub struct PropertiesPanelMessageHandler {}
+pub struct PropertiesPanelMessageHandler {
+	pub section_expanded: HashMap<u64, bool>,
+}
 
 #[message_handler_data]
 impl MessageHandler<PropertiesPanelMessage, PropertiesPanelMessageContext<'_>> for PropertiesPanelMessageHandler {
@@ -52,6 +56,7 @@ impl MessageHandler<PropertiesPanelMessage, PropertiesPanelMessageContext<'_>> f
 					selection_network_path,
 					document_name,
 					executor,
+					section_expanded: &self.section_expanded,
 				};
 				let layout = Layout(NodeGraphMessageHandler::collate_properties(&mut node_properties_context));
 
@@ -60,6 +65,16 @@ impl MessageHandler<PropertiesPanelMessage, PropertiesPanelMessageContext<'_>> f
 					layout_target: LayoutTarget::PropertiesPanel,
 				});
 			}
+			PropertiesPanelMessage::SetAllSectionsExpanded { expanded } => {
+				for value in self.section_expanded.values_mut() {
+					*value = expanded;
+				}
+				responses.add(PropertiesPanelMessage::Refresh);
+			}
+			PropertiesPanelMessage::SetSectionExpanded { node_id, expanded } => {
+				self.section_expanded.insert(node_id, expanded);
+				responses.add(PropertiesPanelMessage::Refresh);
+			}
 		}
 	}
 
diff --git a/frontend/src/components/widgets/WidgetSection.svelte b/frontend/src/components/widgets/WidgetSection.svelte
index af55fe7f3d..c2302c08d8 100644
--- a/frontend/src/components/widgets/WidgetSection.svelte
+++ b/frontend/src/components/widgets/WidgetSection.svelte
@@ -16,14 +16,23 @@
 	export { className as class };
 	export let classes: Record<string, boolean> = {};
 
-	let expanded = true;
+	$: expanded = widgetData.expanded;
 
 	const editor = getContext<Editor>("editor");
 </script>
 
-<!-- TODO: Implement collapsable sections with properties system -->
 <LayoutCol class={`widget-section ${className}`.trim()} {classes}>
-	<button class="header" class:expanded on:click|stopPropagation={() => (expanded = !expanded)} tabindex="0">
+	<button
+		class="header"
+		class:expanded
+		on:click|stopPropagation={(e) => {
+			if (e.altKey) {
+				editor.handle.setAllSectionsExpanded(!expanded);
+			} else {
+				editor.handle.setSectionExpanded(widgetData.id, !expanded);
+			}
+		}}
+	>
 		<div class="expand-arrow"></div>
 		<TextLabel tooltipLabel={widgetData.name} tooltipDescription={widgetData.description} bold={true}>{widgetData.name}</TextLabel>
 		<IconButton
diff --git a/frontend/src/messages.ts b/frontend/src/messages.ts
index 92b35116f4..4120c46123 100644
--- a/frontend/src/messages.ts
+++ b/frontend/src/messages.ts
@@ -94,7 +94,7 @@ export class UpdateNodeGraphWires extends JsMessage {
 	readonly wires!: WireUpdate[];
 }
 
-export class ClearAllNodeGraphWires extends JsMessage {}
+export class ClearAllNodeGraphWires extends JsMessage { }
 
 export class UpdateNodeGraphTransform extends JsMessage {
 	readonly transform!: NodeGraphTransform;
@@ -337,7 +337,7 @@ export class WindowPointerLockMove extends JsMessage {
 	readonly y!: number;
 }
 
-export class WindowFullscreen extends JsMessage {}
+export class WindowFullscreen extends JsMessage { }
 
 // Rust enum `Key`
 export type KeyRaw = string;
@@ -740,12 +740,12 @@ export class UpdateMouseCursor extends JsMessage {
 	readonly cursor!: MouseCursorIcon;
 }
 
-export class TriggerLoadFirstAutoSaveDocument extends JsMessage {}
-export class TriggerLoadRestAutoSaveDocuments extends JsMessage {}
+export class TriggerLoadFirstAutoSaveDocument extends JsMessage { }
+export class TriggerLoadRestAutoSaveDocuments extends JsMessage { }
 
-export class TriggerOpenLaunchDocuments extends JsMessage {}
+export class TriggerOpenLaunchDocuments extends JsMessage { }
 
-export class TriggerLoadPreferences extends JsMessage {}
+export class TriggerLoadPreferences extends JsMessage { }
 
 export class TriggerFetchAndOpenDocument extends JsMessage {
 	readonly name!: string;
@@ -753,11 +753,11 @@ export class TriggerFetchAndOpenDocument extends JsMessage {
 	readonly filename!: string;
 }
 
-export class TriggerOpen extends JsMessage {}
+export class TriggerOpen extends JsMessage { }
 
-export class TriggerImport extends JsMessage {}
+export class TriggerImport extends JsMessage { }
 
-export class TriggerClipboardRead extends JsMessage {}
+export class TriggerClipboardRead extends JsMessage { }
 
 export class TriggerSaveDocument extends JsMessage {
 	readonly documentId!: bigint;
@@ -794,7 +794,7 @@ export class TriggerSaveActiveDocument extends JsMessage {
 	readonly documentId!: bigint;
 }
 
-export class DocumentChanged extends JsMessage {}
+export class DocumentChanged extends JsMessage { }
 
 export type LayerStructureEntry = {
 	layerId: bigint;
@@ -836,7 +836,7 @@ export class DisplayEditableTextboxTransform extends JsMessage {
 	readonly transform!: number[];
 }
 
-export class DisplayRemoveEditableTextbox extends JsMessage {}
+export class DisplayRemoveEditableTextbox extends JsMessage { }
 
 export class UpdateDocumentLayerDetails extends JsMessage {
 	@Type(() => LayerPanelEntry)
@@ -884,7 +884,7 @@ export class LayerPanelEntry {
 	clippable!: boolean;
 }
 
-export class DisplayDialogDismiss extends JsMessage {}
+export class DisplayDialogDismiss extends JsMessage { }
 
 export class Font {
 	fontFamily!: string;
@@ -892,7 +892,7 @@ export class Font {
 	fontStyle!: string;
 }
 
-export class TriggerFontCatalogLoad extends JsMessage {}
+export class TriggerFontCatalogLoad extends JsMessage { }
 
 export class TriggerFontDataLoad extends JsMessage {
 	@Type(() => Font)
@@ -905,7 +905,7 @@ export class TriggerVisitLink extends JsMessage {
 	url!: string;
 }
 
-export class TriggerTextCommit extends JsMessage {}
+export class TriggerTextCommit extends JsMessage { }
 
 export class TriggerClipboardWrite extends JsMessage {
 	readonly content!: string;
@@ -923,7 +923,7 @@ export class TriggerAboutGraphiteLocalizedCommitDate extends JsMessage {
 	readonly commitDate!: string;
 }
 
-export class TriggerDisplayThirdPartyLicensesDialog extends JsMessage {}
+export class TriggerDisplayThirdPartyLicensesDialog extends JsMessage { }
 
 // WIDGET PROPS
 
@@ -1587,7 +1587,7 @@ export function isWidgetTable(layoutTable: LayoutGroup): layoutTable is WidgetTa
 	return Boolean((layoutTable as WidgetTable)?.tableWidgets);
 }
 
-export type WidgetSection = { name: string; description: string; visible: boolean; pinned: boolean; id: bigint; layout: Layout };
+export type WidgetSection = { name: string; description: string; visible: boolean; pinned: boolean; expanded: boolean; id: bigint; layout: Layout };
 export function isWidgetSection(layoutRow: LayoutGroup): layoutRow is WidgetSection {
 	return Boolean((layoutRow as WidgetSection)?.layout);
 }
@@ -1612,6 +1612,7 @@ function createLayoutGroup(layoutGroup: any): LayoutGroup {
 			description: layoutGroup.section.description,
 			visible: layoutGroup.section.visible,
 			pinned: layoutGroup.section.pinned,
+			expanded: layoutGroup.section.expanded,
 			id: layoutGroup.section.id,
 			layout: layoutGroup.section.layout.map(createLayoutGroup),
 		};
@@ -1630,39 +1631,39 @@ function createLayoutGroup(layoutGroup: any): LayoutGroup {
 }
 
 // WIDGET LAYOUTS
-export class UpdateDialogButtons extends WidgetDiffUpdate {}
+export class UpdateDialogButtons extends WidgetDiffUpdate { }
 
-export class UpdateDialogColumn1 extends WidgetDiffUpdate {}
+export class UpdateDialogColumn1 extends WidgetDiffUpdate { }
 
-export class UpdateDialogColumn2 extends WidgetDiffUpdate {}
+export class UpdateDialogColumn2 extends WidgetDiffUpdate { }
 
-export class UpdateDocumentBarLayout extends WidgetDiffUpdate {}
+export class UpdateDocumentBarLayout extends WidgetDiffUpdate { }
 
-export class UpdateLayersPanelControlBarLeftLayout extends WidgetDiffUpdate {}
+export class UpdateLayersPanelControlBarLeftLayout extends WidgetDiffUpdate { }
 
-export class UpdateLayersPanelControlBarRightLayout extends WidgetDiffUpdate {}
+export class UpdateLayersPanelControlBarRightLayout extends WidgetDiffUpdate { }
 
-export class UpdateLayersPanelBottomBarLayout extends WidgetDiffUpdate {}
+export class UpdateLayersPanelBottomBarLayout extends WidgetDiffUpdate { }
 
-export class UpdateMenuBarLayout extends WidgetDiffUpdate {}
+export class UpdateMenuBarLayout extends WidgetDiffUpdate { }
 
-export class UpdateNodeGraphControlBarLayout extends WidgetDiffUpdate {}
+export class UpdateNodeGraphControlBarLayout extends WidgetDiffUpdate { }
 
-export class UpdateWelcomeScreenButtonsLayout extends WidgetDiffUpdate {}
+export class UpdateWelcomeScreenButtonsLayout extends WidgetDiffUpdate { }
 
-export class UpdatePropertiesPanelLayout extends WidgetDiffUpdate {}
+export class UpdatePropertiesPanelLayout extends WidgetDiffUpdate { }
 
-export class UpdateDataPanelLayout extends WidgetDiffUpdate {}
+export class UpdateDataPanelLayout extends WidgetDiffUpdate { }
 
-export class UpdateStatusBarHintsLayout extends WidgetDiffUpdate {}
+export class UpdateStatusBarHintsLayout extends WidgetDiffUpdate { }
 
-export class UpdateStatusBarInfoLayout extends WidgetDiffUpdate {}
+export class UpdateStatusBarInfoLayout extends WidgetDiffUpdate { }
 
-export class UpdateToolOptionsLayout extends WidgetDiffUpdate {}
+export class UpdateToolOptionsLayout extends WidgetDiffUpdate { }
 
-export class UpdateToolShelfLayout extends WidgetDiffUpdate {}
+export class UpdateToolShelfLayout extends WidgetDiffUpdate { }
 
-export class UpdateWorkingColorsLayout extends WidgetDiffUpdate {}
+export class UpdateWorkingColorsLayout extends WidgetDiffUpdate { }
 
 // `any` is used since the type of the object should be known from the Rust side
 type JSMessageFactory = (data: any, wasm: WebAssembly.Memory, handle: EditorHandle) => JsMessage;
diff --git a/frontend/wasm/src/editor_api.rs b/frontend/wasm/src/editor_api.rs
index aaa17a1d22..636b4dbf09 100644
--- a/frontend/wasm/src/editor_api.rs
+++ b/frontend/wasm/src/editor_api.rs
@@ -846,6 +846,20 @@ impl EditorHandle {
 		self.dispatch(message);
 	}
 
+	/// Set section expanded state in the Properties panel
+	#[wasm_bindgen(js_name = setSectionExpanded)]
+	pub fn set_section_expanded(&self, node_id: u64, expanded: bool) {
+		let message = DocumentMessage::PropertiesPanel(PropertiesPanelMessage::SetSectionExpanded { node_id, expanded });
+		self.dispatch(message);
+	}
+
+	/// Set all sections expanded state in the Properties panel
+	#[wasm_bindgen(js_name = setAllSectionsExpanded)]
+	pub fn set_all_sections_expanded(&self, expanded: bool) {
+		let message = DocumentMessage::PropertiesPanel(PropertiesPanelMessage::SetAllSectionsExpanded { expanded });
+		self.dispatch(message);
+	}
+
 	/// Set the active panel to the most recently clicked panel
 	#[wasm_bindgen(js_name = setActivePanel)]
 	pub fn set_active_panel(&self, panel: String) {

From 57e765a86277047a745d50dee258c52fc02726ba Mon Sep 17 00:00:00 2001
From: Kulratan Thapar <kulratan.thapar97@gmail.com>
Date: Wed, 18 Feb 2026 17:13:24 +0000
Subject: [PATCH 2/4] Fix

---
 frontend/src/messages.ts | 64 ++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/frontend/src/messages.ts b/frontend/src/messages.ts
index 4120c46123..d821a0f054 100644
--- a/frontend/src/messages.ts
+++ b/frontend/src/messages.ts
@@ -94,7 +94,7 @@ export class UpdateNodeGraphWires extends JsMessage {
 	readonly wires!: WireUpdate[];
 }
 
-export class ClearAllNodeGraphWires extends JsMessage { }
+export class ClearAllNodeGraphWires extends JsMessage {}
 
 export class UpdateNodeGraphTransform extends JsMessage {
 	readonly transform!: NodeGraphTransform;
@@ -337,7 +337,7 @@ export class WindowPointerLockMove extends JsMessage {
 	readonly y!: number;
 }
 
-export class WindowFullscreen extends JsMessage { }
+export class WindowFullscreen extends JsMessage {}
 
 // Rust enum `Key`
 export type KeyRaw = string;
@@ -740,12 +740,12 @@ export class UpdateMouseCursor extends JsMessage {
 	readonly cursor!: MouseCursorIcon;
 }
 
-export class TriggerLoadFirstAutoSaveDocument extends JsMessage { }
-export class TriggerLoadRestAutoSaveDocuments extends JsMessage { }
+export class TriggerLoadFirstAutoSaveDocument extends JsMessage {}
+export class TriggerLoadRestAutoSaveDocuments extends JsMessage {}
 
-export class TriggerOpenLaunchDocuments extends JsMessage { }
+export class TriggerOpenLaunchDocuments extends JsMessage {}
 
-export class TriggerLoadPreferences extends JsMessage { }
+export class TriggerLoadPreferences extends JsMessage {}
 
 export class TriggerFetchAndOpenDocument extends JsMessage {
 	readonly name!: string;
@@ -753,11 +753,11 @@ export class TriggerFetchAndOpenDocument extends JsMessage {
 	readonly filename!: string;
 }
 
-export class TriggerOpen extends JsMessage { }
+export class TriggerOpen extends JsMessage {}
 
-export class TriggerImport extends JsMessage { }
+export class TriggerImport extends JsMessage {}
 
-export class TriggerClipboardRead extends JsMessage { }
+export class TriggerClipboardRead extends JsMessage {}
 
 export class TriggerSaveDocument extends JsMessage {
 	readonly documentId!: bigint;
@@ -794,7 +794,7 @@ export class TriggerSaveActiveDocument extends JsMessage {
 	readonly documentId!: bigint;
 }
 
-export class DocumentChanged extends JsMessage { }
+export class DocumentChanged extends JsMessage {}
 
 export type LayerStructureEntry = {
 	layerId: bigint;
@@ -836,7 +836,7 @@ export class DisplayEditableTextboxTransform extends JsMessage {
 	readonly transform!: number[];
 }
 
-export class DisplayRemoveEditableTextbox extends JsMessage { }
+export class DisplayRemoveEditableTextbox extends JsMessage {}
 
 export class UpdateDocumentLayerDetails extends JsMessage {
 	@Type(() => LayerPanelEntry)
@@ -884,7 +884,7 @@ export class LayerPanelEntry {
 	clippable!: boolean;
 }
 
-export class DisplayDialogDismiss extends JsMessage { }
+export class DisplayDialogDismiss extends JsMessage {}
 
 export class Font {
 	fontFamily!: string;
@@ -892,7 +892,7 @@ export class Font {
 	fontStyle!: string;
 }
 
-export class TriggerFontCatalogLoad extends JsMessage { }
+export class TriggerFontCatalogLoad extends JsMessage {}
 
 export class TriggerFontDataLoad extends JsMessage {
 	@Type(() => Font)
@@ -905,7 +905,7 @@ export class TriggerVisitLink extends JsMessage {
 	url!: string;
 }
 
-export class TriggerTextCommit extends JsMessage { }
+export class TriggerTextCommit extends JsMessage {}
 
 export class TriggerClipboardWrite extends JsMessage {
 	readonly content!: string;
@@ -923,7 +923,7 @@ export class TriggerAboutGraphiteLocalizedCommitDate extends JsMessage {
 	readonly commitDate!: string;
 }
 
-export class TriggerDisplayThirdPartyLicensesDialog extends JsMessage { }
+export class TriggerDisplayThirdPartyLicensesDialog extends JsMessage {}
 
 // WIDGET PROPS
 
@@ -1631,39 +1631,39 @@ function createLayoutGroup(layoutGroup: any): LayoutGroup {
 }
 
 // WIDGET LAYOUTS
-export class UpdateDialogButtons extends WidgetDiffUpdate { }
+export class UpdateDialogButtons extends WidgetDiffUpdate {}
 
-export class UpdateDialogColumn1 extends WidgetDiffUpdate { }
+export class UpdateDialogColumn1 extends WidgetDiffUpdate {}
 
-export class UpdateDialogColumn2 extends WidgetDiffUpdate { }
+export class UpdateDialogColumn2 extends WidgetDiffUpdate {}
 
-export class UpdateDocumentBarLayout extends WidgetDiffUpdate { }
+export class UpdateDocumentBarLayout extends WidgetDiffUpdate {}
 
-export class UpdateLayersPanelControlBarLeftLayout extends WidgetDiffUpdate { }
+export class UpdateLayersPanelControlBarLeftLayout extends WidgetDiffUpdate {}
 
-export class UpdateLayersPanelControlBarRightLayout extends WidgetDiffUpdate { }
+export class UpdateLayersPanelControlBarRightLayout extends WidgetDiffUpdate {}
 
-export class UpdateLayersPanelBottomBarLayout extends WidgetDiffUpdate { }
+export class UpdateLayersPanelBottomBarLayout extends WidgetDiffUpdate {}
 
-export class UpdateMenuBarLayout extends WidgetDiffUpdate { }
+export class UpdateMenuBarLayout extends WidgetDiffUpdate {}
 
-export class UpdateNodeGraphControlBarLayout extends WidgetDiffUpdate { }
+export class UpdateNodeGraphControlBarLayout extends WidgetDiffUpdate {}
 
-export class UpdateWelcomeScreenButtonsLayout extends WidgetDiffUpdate { }
+export class UpdateWelcomeScreenButtonsLayout extends WidgetDiffUpdate {}
 
-export class UpdatePropertiesPanelLayout extends WidgetDiffUpdate { }
+export class UpdatePropertiesPanelLayout extends WidgetDiffUpdate {}
 
-export class UpdateDataPanelLayout extends WidgetDiffUpdate { }
+export class UpdateDataPanelLayout extends WidgetDiffUpdate {}
 
-export class UpdateStatusBarHintsLayout extends WidgetDiffUpdate { }
+export class UpdateStatusBarHintsLayout extends WidgetDiffUpdate {}
 
-export class UpdateStatusBarInfoLayout extends WidgetDiffUpdate { }
+export class UpdateStatusBarInfoLayout extends WidgetDiffUpdate {}
 
-export class UpdateToolOptionsLayout extends WidgetDiffUpdate { }
+export class UpdateToolOptionsLayout extends WidgetDiffUpdate {}
 
-export class UpdateToolShelfLayout extends WidgetDiffUpdate { }
+export class UpdateToolShelfLayout extends WidgetDiffUpdate {}
 
-export class UpdateWorkingColorsLayout extends WidgetDiffUpdate { }
+export class UpdateWorkingColorsLayout extends WidgetDiffUpdate {}
 
 // `any` is used since the type of the object should be known from the Rust side
 type JSMessageFactory = (data: any, wasm: WebAssembly.Memory, handle: EditorHandle) => JsMessage;

From 6c8169d417076698dd5cbe5fb139b7a84858ce99 Mon Sep 17 00:00:00 2001
From: Kulratan Thapar <kulratan.thapar97@gmail.com>
Date: Thu, 19 Feb 2026 07:36:34 +0000
Subject: [PATCH 3/4] Fix

---
 .../document/graph_operation/utility_types.rs |  1 +
 .../document/node_graph/node_properties.rs    | 14 ++---
 .../properties_panel_message_handler.rs       | 52 +++++++++++++++++--
 3 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/editor/src/messages/portfolio/document/graph_operation/utility_types.rs b/editor/src/messages/portfolio/document/graph_operation/utility_types.rs
index d364a78774..c37d3c6185 100644
--- a/editor/src/messages/portfolio/document/graph_operation/utility_types.rs
+++ b/editor/src/messages/portfolio/document/graph_operation/utility_types.rs
@@ -125,6 +125,7 @@ impl<'a> ModifyInputsContext<'a> {
 	pub fn create_layer(&mut self, new_id: NodeId) -> LayerNodeIdentifier {
 		let new_merge_node = resolve_network_node_type("Merge").expect("Merge node").default_node_template();
 		self.network_interface.insert_node(new_id, new_merge_node, &[]);
+		self.responses.add(PropertiesPanelMessage::SetSectionExpanded { node_id: new_id.0, expanded: false });
 		LayerNodeIdentifier::new(new_id, self.network_interface)
 	}
 
diff --git a/editor/src/messages/portfolio/document/node_graph/node_properties.rs b/editor/src/messages/portfolio/document/node_graph/node_properties.rs
index 24e8f827e8..9c3858bb25 100644
--- a/editor/src/messages/portfolio/document/node_graph/node_properties.rs
+++ b/editor/src/messages/portfolio/document/node_graph/node_properties.rs
@@ -1843,13 +1843,13 @@ pub(crate) fn generate_node_properties(node_id: NodeId, context: &mut NodeProper
 
 	let visible = context.network_interface.is_visible(&node_id, context.selection_network_path);
 	let pinned = context.network_interface.is_pinned(&node_id, context.selection_network_path);
-	let is_merge_node = context
-		.network_interface
-		.reference(&node_id, context.selection_network_path)
-		.as_ref()
-		.is_some_and(|id| id.implementation_name_from_identifier() == "Merge");
-	let default_expanded = !is_merge_node;
-	let expanded = context.section_expanded.get(&node_id.0).copied().unwrap_or(default_expanded);
+	let expanded = context.section_expanded.get(&node_id.0).copied().unwrap_or_else(|| {
+		!context
+			.network_interface
+			.reference(&node_id, context.selection_network_path)
+			.as_ref()
+			.is_some_and(|id| id.implementation_name_from_identifier() == "Merge")
+	});
 
 	LayoutGroup::Section {
 		name,
diff --git a/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs b/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs
index 1665c94cf5..fef0eedddf 100644
--- a/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs
+++ b/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs
@@ -66,10 +66,25 @@ impl MessageHandler<PropertiesPanelMessage, PropertiesPanelMessageContext<'_>> f
 				});
 			}
 			PropertiesPanelMessage::SetAllSectionsExpanded { expanded } => {
-				for value in self.section_expanded.values_mut() {
-					*value = expanded;
-				}
-				responses.add(PropertiesPanelMessage::Refresh);
+				let mut layout = {
+					let mut node_properties_context = NodePropertiesContext {
+						persistent_data,
+						responses,
+						network_interface,
+						selection_network_path,
+						document_name,
+						executor,
+						section_expanded: &self.section_expanded,
+					};
+					Layout(NodeGraphMessageHandler::collate_properties(&mut node_properties_context))
+				};
+
+				Self::update_all_section_expansion_recursive(&mut layout.0, expanded, &mut self.section_expanded, network_interface, selection_network_path);
+
+				responses.add(LayoutMessage::SendLayout {
+					layout,
+					layout_target: LayoutTarget::PropertiesPanel,
+				});
 			}
 			PropertiesPanelMessage::SetSectionExpanded { node_id, expanded } => {
 				self.section_expanded.insert(node_id, expanded);
@@ -82,3 +97,32 @@ impl MessageHandler<PropertiesPanelMessage, PropertiesPanelMessageContext<'_>> f
 		actions!(PropertiesMessageDiscriminant;)
 	}
 }
+
+impl PropertiesPanelMessageHandler {
+	fn update_all_section_expansion_recursive(
+		layout: &mut [LayoutGroup],
+		expanded: bool,
+		section_expanded: &mut HashMap<u64, bool>,
+		network_interface: &NodeNetworkInterface,
+		selection_network_path: &[NodeId],
+	) {
+		for group in layout {
+			if let LayoutGroup::Section {
+				id, layout, expanded: group_expanded, ..
+			} = group
+			{
+				let is_merge_node = network_interface
+					.reference(&NodeId(*id), selection_network_path)
+					.as_ref()
+					.is_some_and(|id| id.implementation_name_from_identifier() == "Merge");
+
+				if !is_merge_node {
+					*group_expanded = expanded;
+					section_expanded.insert(*id, expanded);
+				}
+
+				Self::update_all_section_expansion_recursive(&mut layout.0, expanded, section_expanded, network_interface, selection_network_path);
+			}
+		}
+	}
+}

From bf14f892b12366e515d029a58b88ce4f7987d97e Mon Sep 17 00:00:00 2001
From: Kulratan Thapar <kulratan.thapar97@gmail.com>
Date: Thu, 19 Feb 2026 18:40:10 +0000
Subject: [PATCH 4/4] Requested changes

---
 .../properties_panel_message_handler.rs       | 23 ++++---------------
 .../components/widgets/WidgetSection.svelte   |  4 +++-
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs b/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs
index fef0eedddf..716a5903e2 100644
--- a/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs
+++ b/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs
@@ -79,7 +79,7 @@ impl MessageHandler<PropertiesPanelMessage, PropertiesPanelMessageContext<'_>> f
 					Layout(NodeGraphMessageHandler::collate_properties(&mut node_properties_context))
 				};
 
-				Self::update_all_section_expansion_recursive(&mut layout.0, expanded, &mut self.section_expanded, network_interface, selection_network_path);
+				Self::update_all_section_expansion_recursive(&mut layout.0, expanded, &mut self.section_expanded);
 
 				responses.add(LayoutMessage::SendLayout {
 					layout,
@@ -99,29 +99,16 @@ impl MessageHandler<PropertiesPanelMessage, PropertiesPanelMessageContext<'_>> f
 }
 
 impl PropertiesPanelMessageHandler {
-	fn update_all_section_expansion_recursive(
-		layout: &mut [LayoutGroup],
-		expanded: bool,
-		section_expanded: &mut HashMap<u64, bool>,
-		network_interface: &NodeNetworkInterface,
-		selection_network_path: &[NodeId],
-	) {
+	fn update_all_section_expansion_recursive(layout: &mut [LayoutGroup], expanded: bool, section_expanded: &mut HashMap<u64, bool>) {
 		for group in layout {
 			if let LayoutGroup::Section {
 				id, layout, expanded: group_expanded, ..
 			} = group
 			{
-				let is_merge_node = network_interface
-					.reference(&NodeId(*id), selection_network_path)
-					.as_ref()
-					.is_some_and(|id| id.implementation_name_from_identifier() == "Merge");
+				*group_expanded = expanded;
+				section_expanded.insert(*id, expanded);
 
-				if !is_merge_node {
-					*group_expanded = expanded;
-					section_expanded.insert(*id, expanded);
-				}
-
-				Self::update_all_section_expansion_recursive(&mut layout.0, expanded, section_expanded, network_interface, selection_network_path);
+				Self::update_all_section_expansion_recursive(&mut layout.0, expanded, section_expanded);
 			}
 		}
 	}
diff --git a/frontend/src/components/widgets/WidgetSection.svelte b/frontend/src/components/widgets/WidgetSection.svelte
index c2302c08d8..d01b46e579 100644
--- a/frontend/src/components/widgets/WidgetSection.svelte
+++ b/frontend/src/components/widgets/WidgetSection.svelte
@@ -3,6 +3,7 @@
 
 	import type { Editor } from "@graphite/editor";
 	import { isWidgetSpanRow, isWidgetSection, type WidgetSection as WidgetSectionFromJsMessages, type LayoutTarget } from "@graphite/messages";
+	import { operatingSystem } from "@graphite/utility-functions/platform";
 
 	import LayoutCol from "@graphite/components/layout/LayoutCol.svelte";
 	import IconButton from "@graphite/components/widgets/buttons/IconButton.svelte";
@@ -26,7 +27,8 @@
 		class="header"
 		class:expanded
 		on:click|stopPropagation={(e) => {
-			if (e.altKey) {
+			const accel = operatingSystem() === "Mac" ? e.metaKey : e.ctrlKey;
+			if (e.altKey || accel) {
 				editor.handle.setAllSectionsExpanded(!expanded);
 			} else {
 				editor.handle.setSectionExpanded(widgetData.id, !expanded);