Fixes #203
Merge pull request #207 from theponti/enhancement/folders-form-partial-#203

Fixes #203