diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java
index 60f7d38..21fac1b 100644
--- a/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java
+++ b/src/main/java/de/fanta/challenges/guis/settingsgui/ChallengesGui.java
@@ -80,10 +80,6 @@
                 GUIUtils.sendTitleToAll("Challenge", "Zufällige Drops neu gemischt!", ChatUtil.GREEN);
             }
 
-            case BACK_INDEX -> new MainGui(player).open();
-            case CLOSE_IDEX -> player.closeInventory();
-
-
             case SHARED_DAMAGE_INDEX -> {
                 if (plugin.getConfig().getBoolean("sharedmg")) {
                     GUIUtils.setConfig("sharedmg", false);
@@ -264,6 +260,11 @@
             }
         }
         new ChallengesGui(player).open();
+
+        switch (slot) {
+            case BACK_INDEX -> new MainGui(player).open();
+            case CLOSE_IDEX -> player.closeInventory();
+        }
     }
 
     @Override
diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java
index ee308e6..8e4b82a 100644
--- a/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java
+++ b/src/main/java/de/fanta/challenges/guis/settingsgui/OtherSettingsGui.java
@@ -49,9 +49,6 @@
 
         int slot = event.getSlot();
         switch (slot) {
-            case BACK_INDEX -> new MainGui(player).open();
-            case CLOSE_IDEX -> player.closeInventory();
-
             case VILLAGER_TRADE_LIMITS_INDEX -> {
                 if (plugin.getConfig().getBoolean("disablevillagertradelimits")) {
                     GUIUtils.sendTitleToAll("Einstellungen", "Villager Trade Limits aktiviert", ChatUtil.RED);
@@ -124,7 +121,12 @@
             default -> {
             }
         }
-        new ChallengesGui(player).open();
+        new OtherSettingsGui(player).open();
+
+        switch (slot) {
+            case BACK_INDEX -> new MainGui(player).open();
+            case CLOSE_IDEX -> player.closeInventory();
+        }
     }
 
     @Override
diff --git a/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java b/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java
index 52202fc..7a74bb0 100644
--- a/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java
+++ b/src/main/java/de/fanta/challenges/guis/settingsgui/ServerSettingsGui.java
@@ -48,9 +48,6 @@
 
         int slot = event.getSlot();
         switch (slot) {
-            case BACK_INDEX -> new MainGui(player).open();
-            case CLOSE_IDEX -> player.closeInventory();
-
             case DIFFICULTY_INDEX -> {
                 if (plugin.getDifficulty() == Difficulty.EASY) {
                     plugin.setDifficulty(Difficulty.NORMAL);
@@ -125,7 +122,12 @@
             default -> {
             }
         }
-        new MainGui(player).open();
+        new ServerSettingsGui(player).open();
+
+        switch (slot) {
+            case BACK_INDEX -> new MainGui(player).open();
+            case CLOSE_IDEX -> player.closeInventory();
+        }
     }
 
     @Override