diff --git a/src/main/scala/ocelot/desktop/ui/widget/slot/CPUSlot.scala b/src/main/scala/ocelot/desktop/ui/widget/slot/CPUSlot.scala
index e7bb27c..c81e53d 100644
--- a/src/main/scala/ocelot/desktop/ui/widget/slot/CPUSlot.scala
+++ b/src/main/scala/ocelot/desktop/ui/widget/slot/CPUSlot.scala
@@ -64,7 +64,7 @@ class CPUSlot(owner: Inventory#Slot, node: ComputerNode, val tier: Int) extends
     val cpu = item.get
 
     menu.addEntry(new ContextMenuSubmenu("Set architecture") {
-      for (arch <- cpu.allArchitectures) {
+      for (arch <- cpu.allArchitectures.toList.sortBy(MachineAPI.getArchitectureName)) {
         val name = MachineAPI.getArchitectureName(arch) +
           (if (arch == cpu.architecture) " (current)" else "")