1 files changed, 6 insertions, 1 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 82f74c9e..eb040778 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -169,7 +169,7 @@ class Organize_Controller extends Controller {
         "editable" => false,
         "expandable" => false,
         "id" => $child->id,
-        "leaf" => $child->children_count(array(array("type", "=", "album"))) == 0,
+        "leaf" => false,
         "text" => $child->title,
         "nodeType" => "async");
 
@@ -178,6 +178,11 @@ class Organize_Controller extends Controller {
         $node["children"] = $this->_get_tree($child, $selected);
         $node["expanded"] = true;
       }
+
+      if ($child->children_count(array(array("type", "=", "album"))) == 0) {
+        $node["children"] = array();
+        $node["expanded"] = true;
+      }
       $tree[] = $node;
     }
     return $tree;