3 files changed, 11 insertions, 4 deletions

diff --git a/js/panels/css-panel/style-shorthand.reel/style-shorthand.css b/js/panels/css-panel/style-shorthand.reel/style-shorthand.css
index e746146a..d138dfef 100644
--- a/js/panels/css-panel/style-shorthand.reel/style-shorthand.css
+++ b/js/panels/css-panel/style-shorthand.reel/style-shorthand.css
@@ -14,6 +14,7 @@
     padding-left: 20px;
     margin-top: 0;
     margin-bottom: 0;
+    overflow: hidden;
 }
 .style-shorthand-branch > div {
     background-color: #fafafa;
diff --git a/js/panels/css-panel/style-shorthand.reel/style-shorthand.html b/js/panels/css-panel/style-shorthand.reel/style-shorthand.html
index 63aa64f8..243d9cc7 100644
--- a/js/panels/css-panel/style-shorthand.reel/style-shorthand.html
+++ b/js/panels/css-panel/style-shorthand.reel/style-shorthand.html
@@ -17,13 +17,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "element" : {"#" : "branch"},
                 "label" : { "@" : "textComponent" },
                 "branchList": {"#" : "branchList"},
-                "styleListDisclosure": {"#": "style-list-disclosure"},
                 "arrayController": {"@": "arrayController" },
                 "repetition": {"@": "repetition"},
                 "leafComponent": {"@": "leaf"},
                 "branchComponent": {"@": "branch"},
-                "branchCollapser": {"#": "collapser"}
-
+                "branchCollapser": {"#": "collapser" }
             }
         },
 
@@ -149,6 +147,15 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                     "oneway": true
                 }
             }
+        },
+
+        "collapser" : {
+            "module": "js/panels/collapse-composer",
+            "name": "CollapseComposer",
+            "properties" : {
+                "element": {"#":"collapser"},
+                "component": {"@": "repetition"}
+            }
         }
     }
     </script>
diff --git a/js/panels/css-panel/style-shorthand.reel/style-shorthand.js b/js/panels/css-panel/style-shorthand.reel/style-shorthand.js
index e64d64c7..028699a1 100644
--- a/js/panels/css-panel/style-shorthand.reel/style-shorthand.js
+++ b/js/panels/css-panel/style-shorthand.reel/style-shorthand.js
@@ -29,7 +29,6 @@ var styleShorthand = exports.StyleShorthand= Montage.create(TreeNode, {
             this.arrayController.delegate = this.treeView.contentController;
 
             this.branchCollapser.removeAttribute('id');
-            this.branchCollapser.addEventListener('click', this, false);
         }
     },
     willDraw : {