diff --git a/packages/tree/src/model/node.js b/packages/tree/src/model/node.js
index 1118437e2..025aafbbe 100644
--- a/packages/tree/src/model/node.js
+++ b/packages/tree/src/model/node.js
@@ -9,10 +9,10 @@ const reInitChecked = function(node) {
 
   for (let i = 0, j = siblings.length; i < j; i++) {
     const sibling = siblings[i];
-    if (sibling.checked !== true) {
+    if (sibling.checked !== true || sibling.indeterminate) {
       all = false;
     }
-    if (sibling.checked !== false) {
+    if (sibling.checked !== false || sibling.indeterminate) {
       none = false;
     }
   }
diff --git a/packages/tree/src/tree-node.vue b/packages/tree/src/tree-node.vue
index a241799b0..7f3ee781c 100644
--- a/packages/tree/src/tree-node.vue
+++ b/packages/tree/src/tree-node.vue
@@ -6,7 +6,7 @@
       <span class="el-tree-node__expand-icon"
         :class="{ 'is-leaf': node.isLeaf, expanded: !node.isLeaf && expanded }"
         ></span>
-      <el-checkbox v-if="showCheckbox" :indeterminate="node.indeterminate" v-model="node.checked" @change="handleCheckChange"></el-checkbox>
+      <el-checkbox v-if="showCheckbox" :indeterminate="node.indeterminate" v-model="node.checked" @change="handleCheckChange" @click.native="handleUserClick"></el-checkbox>
       <span
         v-if="node.loading"
         class="el-tree-node__icon el-icon-loading"
@@ -67,8 +67,16 @@
         }
       },
 
+      handleUserClick() {
+        if (this.node.indeterminate) {
+          this.node.setChecked(this.node.checked, true);
+        }
+      },
+
       handleCheckChange(checked) {
-        this.node.setChecked(checked, true);
+        if (!this.node.indeterminate) {
+          this.node.setChecked(checked, true);
+        }
       }
     },