2 files changed, 6 insertions, 2 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index c23d6d61..2ded8a2e 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -161,9 +161,9 @@ class Organize_Controller extends Controller {
         "allowDrag" => false,
         "allowDrop" => access::can("edit", $child),
         "editable" => false,
-        "expandable" => true,
+        "expandable" => false,
         "id" => $child->id,
-        "leaf" => false,
+        "leaf" => $child->children_count(array(array("type", "=", "album"))) == 0,
         "text" => $child->title,
         "nodeType" => "async");
 
diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index c14faf8c..be0e0e18 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -73,6 +73,10 @@
   line-height: 20px;
 }
 
+.g-organize .x-tree-node-leaf .x-tree-node-icon{
+  background-image:url(../vendor/ext/images/default/tree/folder.gif);
+}
+
 .loading div {
   font-size: 1.1em;
   padding-left: 24px;