diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java b/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java
index bcbac55ce..d5b6715d6 100644
--- a/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java
+++ b/common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java
@@ -18,10 +18,11 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 // Logger (for debug stuff)
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-// Uses https://github.com/TheElectronWill/night-config for toml (only for Fabric since Forge allready includes this)
+// Uses https://github.com/TheElectronWill/night-config for toml (only for Fabric since Forge already includes this)
 
 import com.electronwill.nightconfig.core.file.CommentedFileConfig;
 
@@ -33,6 +34,7 @@ import com.seibel.lod.core.config.*;
 
 // Minecraft imports
 
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
@@ -48,7 +50,6 @@ import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.client.resources.language.I18n;	// translation
-import com.mojang.blaze3d.vertex.PoseStack;
 //import net.minecraft.client.gui.narration.NarratableEntry; // Remove in 1.16
 
 /**
@@ -60,7 +61,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
  * Credits to Motschen
  *
  * @author coolGi2007
- * @version 1-6-2022
+ * @version 1-14-2022
  */
 @SuppressWarnings("unchecked")
 public abstract class ConfigGui
@@ -486,6 +487,15 @@ public abstract class ConfigGui
             super.tick();
         }
 
+
+        /** When you close it, it goes to the previous screen and saves */
+        @Override
+        public void onClose()
+        {
+            saveToFile();
+            Objects.requireNonNull(minecraft).setScreen(this.parent);
+        }
+
         @Override
         protected void init()
         {
diff --git a/fabric/build.gradle b/fabric/build.gradle
index 9ecc65c6d..f06d17c85 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -37,7 +37,6 @@ dependencies {
     // Fabric loader
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
 
-    // TODO: This is only for LodMain, try to find a way to remove it
     // Fabric API
     modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"