Apply the same ordering to the right click menu too