diff --git a/src/main/java/me/zeroeightsix/kami/command/commands/FixGuiCommand.java b/src/main/java/me/zeroeightsix/kami/command/commands/FixGuiCommand.java
index 70e45c8b..59a96415 100644
--- a/src/main/java/me/zeroeightsix/kami/command/commands/FixGuiCommand.java
+++ b/src/main/java/me/zeroeightsix/kami/command/commands/FixGuiCommand.java
@@ -17,11 +17,13 @@ public class FixGuiCommand extends Command {
     @Override
     public void call(String[] args) {
         FixGui fixGui = (FixGui) ModuleManager.getModuleByName("Hidden:FixGui");
-        if (fixGui.isEnabled()) {
+        if (fixGui.isEnabled() && fixGui.shouldAutoEnable.getValue()) {
+            fixGui.shouldAutoEnable.setValue(false);
             fixGui.disable();
             Command.sendChatMessage("[" + getLabel() + "] Disabled");
         }
         else {
+            fixGui.shouldAutoEnable.setValue(true);
             fixGui.enable();
             Command.sendChatMessage("[" + getLabel() + "] Enabled");
         }
diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/hidden/FixGui.java b/src/main/java/me/zeroeightsix/kami/module/modules/hidden/FixGui.java
index afb3cda3..6262e8be 100644
--- a/src/main/java/me/zeroeightsix/kami/module/modules/hidden/FixGui.java
+++ b/src/main/java/me/zeroeightsix/kami/module/modules/hidden/FixGui.java
@@ -1,11 +1,18 @@
 package me.zeroeightsix.kami.module.modules.hidden;
 
 import me.zeroeightsix.kami.module.Module;
+import me.zeroeightsix.kami.setting.Setting;
+import me.zeroeightsix.kami.setting.Settings;
 
 import static me.zeroeightsix.kami.util.GuiFrameUtil.fixFrames;
 
+/**
+ * @author S-B99
+ * @see me.zeroeightsix.kami.command.commands.FixGuiCommand
+ */
 @Module.Info(name = "Hidden:FixGui", category = Module.Category.HIDDEN, showOnArray = Module.ShowOnArray.OFF, description = "Moves GUI elements back on screen")
 public class FixGui extends Module {
+    public Setting<Boolean> shouldAutoEnable = register(Settings.b("Enable", true));
     public void onUpdate() {
         fixFrames(mc);
     }