Fix #1736: UI issues in file browser
Merge pull request #1837 from umcsdon/master

Fix #1736: UI issues in file browser