diff --git a/bi/widget.js b/bi/widget.js
index 2d540f5096..0b676040eb 100644
--- a/bi/widget.js
+++ b/bi/widget.js
@@ -17424,6 +17424,9 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
             BI.some(parents, function (i, v) {
                 var t = next[v];
                 if (t == null) {
+                    if (i === 0) {
+                        return true;
+                    }
                     if (BI.isEmpty(next)) {
                         var split = parents.slice(0, i);
                         var expanded = self._getChildren(split);
diff --git a/docs/widget.js b/docs/widget.js
index 2d540f5096..0b676040eb 100644
--- a/docs/widget.js
+++ b/docs/widget.js
@@ -17424,6 +17424,9 @@ BI.shortcut('bi.all_value_chooser_pane', BI.AllValueChooserPane);BI.AbstractTree
             BI.some(parents, function (i, v) {
                 var t = next[v];
                 if (t == null) {
+                    if (i === 0) {
+                        return true;
+                    }
                     if (BI.isEmpty(next)) {
                         var split = parents.slice(0, i);
                         var expanded = self._getChildren(split);
diff --git a/src/component/treevaluechooser/abstract.treevaluechooser.js b/src/component/treevaluechooser/abstract.treevaluechooser.js
index 4da5924915..d20a7c8501 100644
--- a/src/component/treevaluechooser/abstract.treevaluechooser.js
+++ b/src/component/treevaluechooser/abstract.treevaluechooser.js
@@ -185,6 +185,9 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
             BI.some(parents, function (i, v) {
                 var t = next[v];
                 if (t == null) {
+                    if (i === 0) {
+                        return true;
+                    }
                     if (BI.isEmpty(next)) {
                         var split = parents.slice(0, i);
                         var expanded = self._getChildren(split);