diff --git a/core/model/Hierarchy.php b/core/model/Hierarchy.php
index 44ab47cff..6fc419573 100644
--- a/core/model/Hierarchy.php
+++ b/core/model/Hierarchy.php
@@ -159,7 +159,7 @@ class Hierarchy extends DataObjectDecorator {
 	protected function markingFinished() {
 		// Mark childless nodes as expanded.
 		foreach($this->markedNodes as $id => $node) {
-			if(!$node->numChildren()) {
+			if(!$node->isExpanded() && !$node->numChildren()) {
 				$node->markExpanded();
 			}
 		}