diff --git a/src/main/java/troy/autofish/GuiChecker.java b/src/main/java/troy/autofish/GuiChecker.java
index 20971a1..2481ec4 100644
--- a/src/main/java/troy/autofish/GuiChecker.java
+++ b/src/main/java/troy/autofish/GuiChecker.java
@@ -4,14 +4,15 @@
 import net.minecraft.client.gui.screen.ingame.GenericContainerScreen;
 
 public class GuiChecker {
-    private FabricModAutofish modAutofish;
+    private final FabricModAutofish modAutofish;
 
     public GuiChecker(FabricModAutofish modAutofish) {
         this.modAutofish = modAutofish;
     }
 
     public void toggleAutoFish(MinecraftClient client) {
-        if(modAutofish.getConfig().isDisableInGUI())
+        if (this.modAutofish.getConfig().isDisableInContainer()) {
             this.modAutofish.getConfig().setAutofishEnabled(!(client.currentScreen instanceof GenericContainerScreen));
+        }
     }
 }
diff --git a/src/main/java/troy/autofish/config/Config.java b/src/main/java/troy/autofish/config/Config.java
index b0f83dc..63f629d 100644
--- a/src/main/java/troy/autofish/config/Config.java
+++ b/src/main/java/troy/autofish/config/Config.java
@@ -13,6 +13,7 @@ public class Config {
     @Expose boolean useSoundDetection = false;
     @Expose boolean forceMPDetection = false;
     @Expose boolean autoTurnView = false;
+    @Expose boolean disableInContainer = true;
     @Expose float turnAngle = 30.0f;
     @Expose int turnDuration = 500;
     @Expose long recastDelay = 1500;
@@ -52,6 +53,14 @@ public void setAutoTurnView(boolean autoTurnView) {
         this.autoTurnView = autoTurnView;
     }
 
+    public boolean isDisableInContainer() {
+        return disableInContainer;
+    }
+
+    public void setDisableInContainer(boolean disableInContainer) {
+        this.disableInContainer = disableInContainer;
+    }
+
     public float getTurnAngle() {
         return turnAngle;
     }
diff --git a/src/main/java/troy/autofish/gui/AutofishScreenBuilder.java b/src/main/java/troy/autofish/gui/AutofishScreenBuilder.java
index 16436db..46d8aac 100644
--- a/src/main/java/troy/autofish/gui/AutofishScreenBuilder.java
+++ b/src/main/java/troy/autofish/gui/AutofishScreenBuilder.java
@@ -105,14 +105,15 @@ public static Screen buildScreen(FabricModAutofish modAutofish, Screen parentScr
                 .setYesNoTextSupplier(yesNoTextSupplier)
                 .build();
 
-        AbstractConfigListEntry toggleGUIChecker = entryBuilder.startBooleanToggle(Text.translatable("options.autofish.guichecker.title"), config.isPersistentMode())
-                .setDefaultValue(defaults.isDisableInGUI())
+        //Disable in Container
+        AbstractConfigListEntry toggleDisableInContainer = entryBuilder.startBooleanToggle(Text.translatable("options.autofish.disable_in_container.title"), config.isDisableInContainer())
+                .setDefaultValue(defaults.isDisableInContainer())
                 .setTooltip(
-                        Text.translatable("options.autofish.guichecker.tooltip_0"),
-                        Text.translatable("options.autofish.guichecker.tooltip_1")
+                        Text.translatable("options.autofish.disable_in_container.tooltip_0"),
+                        Text.translatable("options.autofish.disable_in_container.tooltip_1")
                 )
                 .setSaveConsumer(newValue -> {
-                    modAutofish.getConfig().setDisableInGUI(newValue);
+                    modAutofish.getConfig().setDisableInContainer(newValue);
                 })
                 .setYesNoTextSupplier(yesNoTextSupplier)
                 .build();
@@ -249,7 +250,8 @@ public static Screen buildScreen(FabricModAutofish modAutofish, Screen parentScr
         subCatBuilderBasic.add(toggleOpenWaterDetection);
         subCatBuilderBasic.add(toggleBreakProtection);
         subCatBuilderBasic.add((togglePersistentMode));
-        subCatBuilderBasic.add(toggleGUIChecker);
+        subCatBuilderBasic.add(toggleDisableInContainer);
+        subCatBuilderBasic.setExpanded(true);
         subCatBuilderBasic.add(toggleAutoTurnView);
         subCatBuilderBasic.add(turnAngleSlider);
         subCatBuilderBasic.add(turnDurationSlider);
diff --git a/src/main/resources/assets/autofish/lang/en_us.json b/src/main/resources/assets/autofish/lang/en_us.json
index 1de25ed..ad9084d 100644
--- a/src/main/resources/assets/autofish/lang/en_us.json
+++ b/src/main/resources/assets/autofish/lang/en_us.json
@@ -31,6 +31,10 @@
   "options.autofish.persistent.tooltip_4": "This is useful for lag issues or when",
   "options.autofish.persistent.tooltip_5": "fishing for long periods of time.",
 
+  "options.autofish.disable_in_container.title": "Disable in Chests",
+  "options.autofish.disable_in_container.tooltip_0": "Automatically disable autofish when",
+  "options.autofish.disable_in_container.tooltip_1": "opening chests.",
+
   "options.autofish.sound.title": "Use Sound Detection",
   "options.autofish.sound.tooltip_0": "\u00A76Newer, more accurate detection based",
   "options.autofish.sound.tooltip_1": "\u00A76on bobber sounds rather than the",