diff --git a/src/react/JSONTree/JSONArrayNode.js b/src/react/JSONTree/JSONArrayNode.js
index b86e9305..c1a7c93a 100644
--- a/src/react/JSONTree/JSONArrayNode.js
+++ b/src/react/JSONTree/JSONArrayNode.js
@@ -6,6 +6,7 @@ import grabNode from './grab-node';
 
 const styles = {
   base: {
+    position: 'relative',
     paddingTop: 2,
     paddingBottom: 2,
     paddingRight: 4,
@@ -100,15 +101,15 @@ export default class JSONArrayNode extends React.Component {
       };
     }
     return (
-      <li style={containerStyle} onClick={::this.handleClick}>
-        <JSONArrow theme={this.props.theme} open={this.state.expanded}/>
+      <li style={containerStyle}>
+        <JSONArrow theme={this.props.theme} open={this.state.expanded} onClick={::this.handleClick}/>
         <label style={{
           ...styles.label,
           color: this.props.theme.base0D
-        }}>
+        }} onClick={::this.handleClick}>
           {this.props.keyName}:
         </label>
-        <span style={spanStyle}>
+        <span style={spanStyle} onClick={::this.handleClick}>
           <span style={styles.spanType}>[]</span>
           {this.getItemString()}
         </span>
diff --git a/src/react/JSONTree/JSONArrow.js b/src/react/JSONTree/JSONArrow.js
index 1eb964d4..a8483ad2 100644
--- a/src/react/JSONTree/JSONArrow.js
+++ b/src/react/JSONTree/JSONArrow.js
@@ -36,6 +36,6 @@ export default class JSONArrow extends React.Component {
         ...styles.open
       };
     }
-    return <div style={style}/>;
+    return <div style={style} onClick={this.props.onClick}/>;
   }
 }
diff --git a/src/react/JSONTree/JSONObjectNode.js b/src/react/JSONTree/JSONObjectNode.js
index cdd7ba71..e7d0db2d 100644
--- a/src/react/JSONTree/JSONObjectNode.js
+++ b/src/react/JSONTree/JSONObjectNode.js
@@ -6,6 +6,7 @@ import grabNode from './grab-node';
 
 const styles = {
   base: {
+    position: 'relative',
     paddingTop: 2,
     paddingBottom: 2,
     paddingRight: 4,
@@ -102,15 +103,15 @@ export default class JSONObjectNode extends React.Component {
       };
     }
     return (
-      <li style={containerStyle} onClick={::this.handleClick}>
-        <JSONArrow theme={this.props.theme} open={this.state.expanded}/>
+      <li style={containerStyle}>
+        <JSONArrow theme={this.props.theme} open={this.state.expanded} onClick={::this.handleClick}/>
         <label style={{
           ...styles.label,
           color: this.props.theme.base0D
-        }}>
+        }} onClick={::this.handleClick}>
           {this.props.keyName}:
         </label>
-        <span style={spanStyle}>
+        <span style={spanStyle} onClick={::this.handleClick}>
           <span style={styles.spanType}>&#123;&#125;</span>
           {this.getItemString()}
         </span>