diff --git a/src/components/treeselect/TreeSelect.vue b/src/components/treeselect/TreeSelect.vue
index 2243ed367..fe0b161e8 100644
--- a/src/components/treeselect/TreeSelect.vue
+++ b/src/components/treeselect/TreeSelect.vue
@@ -209,10 +209,14 @@ export default {
 
                 case 'Space':
                 case 'Enter':
-                    if (!this.overlayVisible) {
-                        this.show();
-                        event.preventDefault();
+                    if (this.overlayVisible) {
+                        this.hide();
                     }
+                    else {
+                        this.show();
+                    }
+
+                    event.preventDefault();
                 break;
 
                 case 'Escape':