Merge pull request #2736 from devoncarew/devoncarew_fix_files_nav

fix an issue with navigation in the files view
Merge branch 'master' into devoncarew_tooltips