HOTFIX: Fix problem with context close button in the tree