diff --git a/src/component/treevaluechooser/abstract.treevaluechooser.js b/src/component/treevaluechooser/abstract.treevaluechooser.js
index d5c76efdf..fb5ec8306 100644
--- a/src/component/treevaluechooser/abstract.treevaluechooser.js
+++ b/src/component/treevaluechooser/abstract.treevaluechooser.js
@@ -749,14 +749,16 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
 
                 return false;
             }
-            if (node.value === parentValues[index]) {
+            if (node.value === parentValues[index] && node.getParent() === currentParent) {
                 index++;
                 currentParent = node;
+
                 return;
             }
 
             return true;
         });
+        
         return findParentNode;
     },