diff --git a/api/js/etemplate/Et2Tree/Et2TreeDropdown.ts b/api/js/etemplate/Et2Tree/Et2TreeDropdown.ts
index b8a9bff5b7..73bd4e3c84 100644
--- a/api/js/etemplate/Et2Tree/Et2TreeDropdown.ts
+++ b/api/js/etemplate/Et2Tree/Et2TreeDropdown.ts
@@ -1050,8 +1050,12 @@ export class Et2TreeDropdown extends SearchMixin<Constructor<any> & Et2InputWidg
                                 @blur=${this.handleInternalBlur}
                                 @et2-click=${(e) =>
                                 {
-                                    // Always hide the popup when a tree item is clicked
-                                    //               this.hide();
+                                    // Hide the popup when a tree item is clicked
+                                    if(this._close_on_select || !this.multiple)
+                                    {
+                                        this.hasFocus = false;
+                                        this.hide();
+                                    }
                                 }}
                                 @keydown=${this.handleComboboxKeyDown}
                                 @sl-selection-change=${this.handleTreeChange}