diff --git a/Addons/Guis/warp-system.lua b/Addons/Guis/warp-system.lua
index 12934a22..bf18db23 100644
--- a/Addons/Guis/warp-system.lua
+++ b/Addons/Guis/warp-system.lua
@@ -85,6 +85,7 @@ local function make_warp_point(position,surface,force,name)
         icon={type='item',name=warp_item}
     })
     _warps().warps[name] = {tag=tag,surface=surface,position=tag.position,old_tile=old_tile}
+    _warps().warps = table.keysort(_warps().warps)
     Gui.left.update('warp-list')
 end