Fix typo in syntax sort
Call focus after sorting
Merge branch 'master' into ST3