diff --git a/static/js/sidebar.mjs b/static/js/sidebar.mjs
index 227ff82..63c2b75 100644
--- a/static/js/sidebar.mjs
+++ b/static/js/sidebar.mjs
@@ -575,7 +575,12 @@ export class N2TreeNode extends CustomHTMLElement {
 		this.rendered = false
 		this.dragNode = null
 
-		this.elExpandToggle.addEventListener('click', event => this.expandNode(event))
+		this.elExpandToggle.addEventListener('click', event => {
+			if (this.node.hasChildren())
+				this.expandNode(event)
+			else
+				_mbus.dispatch('TREE_NODE_SELECTED', this.node)
+		})
 		this.elName.addEventListener('click', () => _mbus.dispatch('TREE_NODE_SELECTED', this.node))
 
 		_mbus.subscribe(`NODE_EXPAND_${node.UUID}`, _state => {