Merge "Small fix in Folder text editing"