Follow-up to #3765: fix #3815 "File filter and search view are broken"
Merge pull request #3830 from ussuri/consolidate-ui-in-topUi

Fix #3815 "File filter and search view are broken"