diff --git a/addon/components/x-tree-node.js b/addon/components/x-tree-node.js
index 13fb3c9..609c20c 100644
--- a/addon/components/x-tree-node.js
+++ b/addon/components/x-tree-node.js
@@ -10,6 +10,13 @@ export default Component.extend({
     return this.get('model.id') === this.get('chosenId');
   }),
 
+  click() {
+    let select = this.get('select');
+    if (select) {
+      select(this.get('model'));
+    }
+  },
+
   mouseEnter() {
     this.set('model.isSelected', true);
     let hover = this.get('hover');
@@ -32,12 +39,6 @@ export default Component.extend({
 
     toggleExpand() {
       this.toggleProperty('model.isExpanded');
-    },
-    select() {
-      let select = this.get('select');
-      if (select) {
-        select(this.get('model'));
-      }
     }
   }
 });
diff --git a/addon/templates/components/x-tree-node.hbs b/addon/templates/components/x-tree-node.hbs
index e5b13e8..e1439d7 100644
--- a/addon/templates/components/x-tree-node.hbs
+++ b/addon/templates/components/x-tree-node.hbs
@@ -15,11 +15,7 @@
 {{/if}}
 
 {{#if hasBlock}}
-  <span onclick={{action 'select'}}>
-    {{yield model}}
-  </span>
+  {{yield model}}
 {{else}}
-  <span onclick={{action 'select'}}>
-    {{model.name}}
-  </span>
+  {{model.name}}
 {{/if}}