diff --git a/src/components/Seed.vue b/src/components/Seed.vue
index 8a97e8b..1c1d627 100644
--- a/src/components/Seed.vue
+++ b/src/components/Seed.vue
@@ -257,7 +257,7 @@ export default defineComponent({
             <ReduceFlashingPicker ref="reduce_flashing" />
             <QuickswapPicker ref="quickswap" />
             <CollectionRatePicker v-if="allow_cr" ref="cr" />
-            <UltraFastJunkPicker :created="created" ref="ufj" />
+            <UltraFastJunkPicker :created="created" :race="settings.race" ref="ufj" />
           </div>
         </li>
         <li class="list-group-item">
diff --git a/src/components/SettingsPage.vue b/src/components/SettingsPage.vue
index 8fccaef..19b5a2f 100644
--- a/src/components/SettingsPage.vue
+++ b/src/components/SettingsPage.vue
@@ -193,6 +193,8 @@ export default defineComponent({
       <SettingPicker color="danger" v-model="set.door_shuffle" name="door_shuffle" :generator="generator" :prefix="prefix" />
       <SettingPicker color="danger" v-if="set.door_shuffle != 'vanilla'"
           v-model="set.lobbies" name="lobbies" :generator="generator" :prefix="prefix" />
+      <SettingPicker color="danger" v-if="!['vanilla', 'basic'].includes(set.door_shuffle)"
+          v-model="set.extra_keys" name="extra_keys" :generator="generator" :prefix="prefix" />
       <SettingPicker color="danger" v-if="set.door_shuffle != 'vanilla'"
           v-model="set.door_type_mode" name="door_type_mode" :generator="generator" :prefix="prefix" />
       <SettingPicker color="danger" v-if="set.door_shuffle != 'vanilla'"
diff --git a/src/components/UltraFastJunkPicker.vue b/src/components/UltraFastJunkPicker.vue
index 5fbc3e1..eae33df 100644
--- a/src/components/UltraFastJunkPicker.vue
+++ b/src/components/UltraFastJunkPicker.vue
@@ -6,6 +6,7 @@ import localforage from "localforage";
 export default defineComponent({
   props: {
     created: null,
+    race: null,
   },
   data() {
     return {
@@ -14,7 +15,7 @@ export default defineComponent({
   },
   computed: {
     valid_rom() {
-      return this.created && this.created > 1757125000;
+      return this.race == "normal" && this.created && this.created > 1757125000;
     }
   },
   async mounted() {
diff --git a/src/data/generator-settings.yaml b/src/data/generator-settings.yaml
index 28963dd..d516fed 100644
--- a/src/data/generator-settings.yaml
+++ b/src/data/generator-settings.yaml
@@ -70,6 +70,7 @@ beta:
   skull_woods: all
   linked_drops: all
   door_shuffle: all
+  extra_keys: all
   lobbies: all
   door_type_mode: all
   trap_door_mode: all
diff --git a/src/data/settings-display.yaml b/src/data/settings-display.yaml
index 60eb3a4..ef09704 100644
--- a/src/data/settings-display.yaml
+++ b/src/data/settings-display.yaml
@@ -20,6 +20,7 @@ crystals_gt:
   3: 3 Crystals
   2: 2 Crystals
   1: 1 Crystal
+  0: Open
   random: Random
 weapons:
   random: Randomized Swords
diff --git a/src/data/settings.yaml b/src/data/settings.yaml
index 031e16e..ab3d60e 100644
--- a/src/data/settings.yaml
+++ b/src/data/settings.yaml
@@ -496,6 +496,24 @@ door_shuffle:
       display: Partitioned
     crossed:
       display: Crossed
+extra_keys:
+  display: Extra Small Keys in Dungeons
+  default: none
+  values:
+    none:
+      display: None
+    extra1:
+      display: 1 Extra
+      tip: Every dungeon that has at least one small key will have one more small key than small key doors.
+    percent20:
+      display: 20% Extra
+      tip: Every dungeon will have 20% more (rounded up) small keys than small key doors.
+    percent30:
+      display: 30% Extra
+      tip: Every dungeon will have 30% more (rounded up) small keys than small key doors.
+    percent40:
+      display: 40% Extra
+      tip: Every dungeon will have 40% more (rounded up) small keys than small key doors.
 lobbies:
   display: Dungeon Lobbies
   default: vanilla