diff --git a/WebHostLib/static/static/playerSettings.json b/WebHostLib/static/static/playerSettings.json
index 318c15fb..e6ee539f 100644
--- a/WebHostLib/static/static/playerSettings.json
+++ b/WebHostLib/static/static/playerSettings.json
@@ -1381,6 +1381,26 @@
           "defaultValue": 0
         }
       }
+    },
+    "key_drop_shuffle": {
+      "keyString": "key_drop_shuffle",
+      "friendlyName": "Key Drop Shuffle",
+      "description": "Allows the small/big keys dropped by enemies/pots to be shuffled into the item pool. This extends the number of checks from 216 to 249",
+      "inputType": "range",
+      "subOptions": {
+        "on": {
+          "keyString": "key_drop_shuffle.on",
+          "friendlyName": "Enabled",
+          "description": "Enables key drop shuffle",
+          "defaultValue": 0
+        },
+        "off": {
+          "keyString": "key_drop_shuffle.off",
+          "friendlyName": "Disabled",
+          "description": "Disables key drop shuffle",
+          "defaultValue": 50
+        }
+      }
     }
   },
   "romOptions": {
diff --git a/WebHostLib/static/static/playerSettings.yaml b/WebHostLib/static/static/playerSettings.yaml
index 36d29d6d..b6e7747f 100644
--- a/WebHostLib/static/static/playerSettings.yaml
+++ b/WebHostLib/static/static/playerSettings.yaml
@@ -304,6 +304,9 @@ intensity: # Only available if the host uses the doors branch, it is ignored oth
   2: 0 # And shuffles open edges and straight staircases
   3: 0 # And shuffles dungeon lobbies
   random: 0 # Picks one of those at random
+key_drop_shuffle: # Only available if the host uses the doors branch, it is ignored otherwise
+  on: 0 # Enables the small keys dropped by enemies or under pots, and the big key dropped by the Ball & Chain guard to be shuffled into the pool. This extends the number of checks to 249.
+  off: 50
 experimental: # Only available if the host uses the doors branch, it is ignored otherwise
   on: 0 # Enables experimental features. Currently, this is just the dungeon keys in chest counter.
   off: 50
diff --git a/playerSettings.yaml b/playerSettings.yaml
index 96359422..4760173f 100644
--- a/playerSettings.yaml
+++ b/playerSettings.yaml
@@ -304,8 +304,11 @@ intensity: # Only available if the host uses the doors branch, it is ignored oth
   2: 0 # And shuffles open edges and straight staircases
   3: 0 # And shuffles dungeon lobbies
   random: 0 # Picks one of those at random
+key_drop_shuffle: # Only available if the host uses the doors branch, it is ignored otherwise
+  on: 0 # Enables the small keys dropped by enemies or under pots, and the big key dropped by the Ball & Chain guard to be shuffled into the pool. This extends the number of checks to 249.
+  off: 50
 experimental: # Only available if the host uses the doors branch, it is ignored otherwise
-  on: 0 # Enables experimental features. Currently, this is just the dungeon keys in chest counter.
+  on: 0 # Enables experimental features.
   off: 50
 debug: # Only available if the host uses the doors branch, it is ignored otherwise
   on: 0 # Enables debugging features. Currently, these are the Item collection counter. (overwrites total triforce pieces) and Castle Gate closed indicator.