diff --git a/core/model/Hierarchy.php b/core/model/Hierarchy.php
index 6ad96f943..e12a3b39d 100644
--- a/core/model/Hierarchy.php
+++ b/core/model/Hierarchy.php
@@ -159,7 +159,11 @@ class Hierarchy extends DataObjectDecorator {
 		if($children) {
 			foreach($children as $child) {
 				if(!$this->markingFilter || $this->markingFilterMatches($child)) {
-					$child->markUnexpanded();
+					if($child->numChildren()) {
+						$child->markUnexpanded();
+					} else {
+						$child->markExpanded();
+					}
 					$this->markedNodes[$child->ID] = $child;
 				}
 			}