diff --git a/src/main/java/xyz/alexcrea/cuanvil/enchant/CAEnchantmentRegistry.java b/src/main/java/xyz/alexcrea/cuanvil/enchant/CAEnchantmentRegistry.java
index 3b285c1..01262f9 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/enchant/CAEnchantmentRegistry.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/enchant/CAEnchantmentRegistry.java
@@ -152,10 +152,10 @@ public class CAEnchantmentRegistry {
 
     /**
      * Gets a map of all the registered enchantments.
-     * @return Map of enchantments.
+     * @return Immutable map of enchantments.
      */
     public Map<NamespacedKey, CAEnchantment> registeredEnchantments() {
-        return byKeyMap;
+        return Collections.unmodifiableMap(byKeyMap);
     }
 
     /**
@@ -178,7 +178,7 @@ public class CAEnchantmentRegistry {
 
     /**
      * Get "clean optimised operation" for get enchantments.
-     * @return Get mutable "clean enchantments optimised operation" list.
+     * @return Mutable "clean enchantments optimised operation" list.
      */
     public List<BulkCleanEnchantOperation> getOptimisedCleanOperators() {
         return optimisedCleanOperators;
@@ -186,7 +186,7 @@ public class CAEnchantmentRegistry {
 
     /**
      * Get "get optimised operation" for get enchantments.
-     * @return Get mutable "get enchantments optimised operation" list.
+     * @return Mutable "get enchantments optimised operation" list.
      */
     public List<BulkGetEnchantOperation> getOptimisedGetOperators() {
         return optimisedGetOperators;
diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantSelectSettingGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantSelectSettingGui.java
index 308d51f..2c50042 100644
--- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantSelectSettingGui.java
+++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/settings/EnchantSelectSettingGui.java
@@ -65,9 +65,9 @@ public class EnchantSelectSettingGui extends SettingGuiListConfigGui<CAEnchantme
     protected Collection<CAEnchantment> getEveryDisplayableInstanceOfGeneric() {
         Stream<CAEnchantment> toDisplayStream;
         if(this.displayUnselected){
-            toDisplayStream = CAEnchantmentRegistry.getInstance().values().stream();
+            toDisplayStream = CAEnchantmentRegistry.getInstance().getNameSortedEnchantments().stream();
         }else{
-            toDisplayStream = this.selectedEnchant.stream();
+            toDisplayStream = this.selectedEnchant.stream().sorted(Comparator.comparing(CAEnchantment::getName));
         }
         Set<CAEnchantment> illegalEnchantments = this.enchantContainer.illegalEnchantments();