Fixed sort order of commands in context menu