Folder edit bugfix 308