Ensure focus of opened favorite file
Merge branch 'master' into ST3