Fixed popup folder merging.