diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index e1cebc9bf31f26d2c27a825565e79546585b189a..ce97e37f3e67a773b31d9905e1e10191a265f0cd 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -76,6 +76,7 @@ App.Data.defaultGameStateVariables = {
 	dangerousPregnancy: 0,
 	debugMode: 0,
 	debugModeCustomFunction: 0,
+	debugModeEventSelection: 0,
 	difficultySwitch: 0,
 	disableLisping: 0,
 	displayAssignments: 1,
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index 5d0c318ff3484e04543706ca3428502ca6761555..b51ecbc0720c5ee7275a26f60f3eb99044fc3f69 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -2,5 +2,5 @@ App.Version = {
 	base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
 	pmod: "3.9.6",
 	commitHash: null,
-	release: 1128 // When getting close to 2000,  please remove the check located within the onLoad() function defined at line five of src/js/eventHandlers.js.
+	release: 1129 // When getting close to 2000,  please remove the check located within the onLoad() function defined at line five of src/js/eventHandlers.js.
 };
diff --git a/src/events/nonRandomEvent.js b/src/events/nonRandomEvent.js
index 7f4d2661dc738f2dc49ab40d0de42b7449c8363d..279e9a13162f9ecbaf085876489a60d7e8a130b7 100644
--- a/src/events/nonRandomEvent.js
+++ b/src/events/nonRandomEvent.js
@@ -155,7 +155,7 @@ App.Events.playNonrandomEvent = function() {
 		V.event.execute(d);
 		V.passageSwitchHandler = clearEvent;
 	} else {
-		if (V.cheatMode) {
+		if (V.debugMode > 0 && V.debugModeEventSelection) {
 			V.nextButton = "Refresh";
 			// show all the scheduled, nonrandom, and queued events, and allow the cheater to play them in any order and skip the remainder
 			App.UI.DOM.appendNewElement("h2", d, "Scheduled and Nonrandom Events");
diff --git a/src/gui/options/options.js b/src/gui/options/options.js
index 6a7cffa56466401ecea9bf75c8667f54f845626a..a7f30d1f456ae6b820f31b888a54d66ea7e5686a 100644
--- a/src/gui/options/options.js
+++ b/src/gui/options/options.js
@@ -507,13 +507,19 @@ App.UI.optionsPassage = function() {
 
 		options.addOption("DebugMode is", "debugMode")
 			.addValue("Enabled", 1).on().addValue("Disabled", 0).off()
-			.addComment("This will add a Display Variables and Bug Report passage to the sidebar.");
+			.addComment("This will add passages to Display Variables and create Bug Reports to the sidebar.");
+		el.append(options.render());
 
 		if (V.debugMode > 0) {
+			options = new App.UI.OptionsGroup();
 			options.addOption("The custom function part of debug mode is", "debugModeCustomFunction")
 				.addValue("Enabled", 1).on().addValue("Disabled", 0).off();
+			options.addOption("Event selection is", "debugModeEventSelection")
+				.addValue("Manual", 1).on().addValue("Automatic", 0).off();
+			App.UI.DOM.appendNewElement("div", el, options.render(), "indent");
 		}
 
+		options = new App.UI.OptionsGroup();
 		option = options.addCustomOption("Genetics array")
 			.addButton("Run test", () => { }, "test genetics");
 		if (V.cheatMode === 1) {
@@ -536,7 +542,7 @@ App.UI.optionsPassage = function() {
 
 		options.addOption("CheatMode is", "cheatMode")
 			.addValue("Enabled", 1).on().addValue("Disabled", 0).off()
-			.addComment("This will allow manual selection of events and unlock some options that would usually be restricted by progress.");
+			.addComment("This will unlock some options that would usually be restricted by progress.");
 
 		if (V.cheatMode === 0) {
 			el.append(options.render());
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index fca571696d41b738d6797fa86c10443aa5f48bae..6b15291a9f471d73df34d855a6e30b2d07d5d3d7 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -1,7 +1,7 @@
 :: Random Individual Event [nobr]
 
 <<if $eventSlave == 0>>
-	<<if $cheatMode == 1>>
+	<<if $debugMode > 0 && $debugModeEventSelection == 1>>
 		<<set $nextButton = "Refresh", $nextLink = "Random Individual Event", $returnTo = "Random Individual Event", $encyclopedia = "Random Events">>
 
 		<<link "Skip week-end events" "Next Week">><</link>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index dc7ae13b84ab1b5ea909f20ce4757215dae5f6f5..dc1466a307aa32a7dcf7d0801bcdc43f4f553535 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -2,7 +2,7 @@
 
 <<if $eventSlave == 0>>
 	<<set $eventSlave = $slaves.random()>>
-	<<if $cheatMode == 1>>
+	<<if $debugMode > 0 && $debugModeEventSelection == 1>>
 		<<set $nextButton = "Refresh", $nextLink = "Random Nonindividual Event", $returnTo = "Random Nonindividual Event", $encyclopedia = "Random Events">>
 
 		<<link "Skip week-end events" "Next Week">><</link>>