diff --git a/src/main/java/com/ldtteam/domumornamentum/container/ArchitectsCutterContainer.java b/src/main/java/com/ldtteam/domumornamentum/container/ArchitectsCutterContainer.java
index 885779fd..c10e0abf 100644
--- a/src/main/java/com/ldtteam/domumornamentum/container/ArchitectsCutterContainer.java
+++ b/src/main/java/com/ldtteam/domumornamentum/container/ArchitectsCutterContainer.java
@@ -187,7 +187,7 @@ public boolean stillValid(@NotNull Player playerIn) {
     }
 
     /**
-     * Handles the given Button-click on the server, currently only used by enchanting. Name is for legacy.
+     * Handles the given Button-click on the server.
      */
     @Override
     public boolean clickMenuButton(@NotNull Player playerIn, int id) {
@@ -196,6 +196,10 @@ public boolean clickMenuButton(@NotNull Player playerIn, int id) {
             this.selectGroup(new ArrayList<>(ModBlocks.getInstance().getOrComputeItemGroups().keySet()).get(id));
             return true;
         }
+        else if (this.getCurrentGroup() == null)
+        {
+            this.selectGroup(new ArrayList<>(ModBlocks.getInstance().getOrComputeItemGroups().keySet()).get(ModBlocks.getInstance().getOrComputeItemGroups().size() - 1));
+        }
 
         int dif = id - ModBlocks.getInstance().getOrComputeItemGroups().size();
         if (dif < ModBlocks.getInstance().getOrComputeItemGroups().get(this.getCurrentGroup()).size())