Fix with wrapping folder names in popup windows
Merge branch 'develop'

* develop:
  Fix with wrapping folder names in popup windows