diff --git a/json-inspector.js b/json-inspector.js
index 910f7c2..19b9ebc 100644
--- a/json-inspector.js
+++ b/json-inspector.js
@@ -22,6 +22,7 @@ module.exports = React.createClass({
         onClick: React.PropTypes.func,
         validateQuery: React.PropTypes.func,
         isExpanded: React.PropTypes.func,
+        isRootCollapsed: React.PropTypes.bool,
         filterOptions: React.PropTypes.object,
         query: React.PropTypes.string,
         filterFunc: React.PropTypes.func,
@@ -93,6 +94,7 @@ module.exports = React.createClass({
                   ),
                   label: 'root',
                   root: true,
+                  isRootCollapsed: p.isRootCollapsed,
                   isExpanded: p.isExpanded,
                   interactiveLabel: p.interactiveLabel,
                   shouldHighlight: p.shouldHighlight,
diff --git a/lib/leaf.js b/lib/leaf.js
index 9dbf647..911badb 100644
--- a/lib/leaf.js
+++ b/lib/leaf.js
@@ -190,7 +190,7 @@ var Leaf = React.createClass({
         var keypath = this.keypath();
 
         if (p.root) {
-            return true;
+            return !p.isRootCollapsed;
         }
 
         if (!p.query) {