Fixed file tree to load on first try
Fixed file tree to load on first try

Merge remote-tracking branch 'origin/pr/640' into develop

* origin/pr/640:
  Fixed file tree to load on first try