diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index 14954524fa..25f05af55b 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -236,7 +236,6 @@
 			if(!(M.config_tag in modes))		// ensure each mode is added only once
 				modes += M.config_tag
 				mode_names[M.config_tag] = M.name
-				probabilities[M.config_tag] = M.probability
 				mode_reports[M.config_tag] = M.generate_report()
 				if(probabilities[M.config_tag]>0)
 					mode_false_report_weight[M.config_tag] = M.false_report_weight
@@ -342,6 +341,9 @@
 		if(probabilities[M.config_tag]<=0)
 			qdel(M)
 			continue
+		if(M.config_tag in SSvote.stored_gamemode_votes && SSvote.stored_gamemode_votes[M.config_tag] < Get(/datum/config_entry/number/dropped_modes))
+			qdel(M)
+			continue
 		if(min_pop[M.config_tag])
 			M.required_players = min_pop[M.config_tag]
 		if(max_pop[M.config_tag])
diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm
index 61b5788ef8..d045a92c83 100644
--- a/code/controllers/configuration/entries/game_options.dm
+++ b/code/controllers/configuration/entries/game_options.dm
@@ -392,3 +392,6 @@
 
 /datum/config_entry/flag/allow_clockwork_marauder_on_station
 	config_entry_value = TRUE
+
+/datum/config_entry/number/dropped_modes
+	config_entry_value = 3
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 45c8e3c8fe..76ebfb6765 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -486,7 +486,7 @@ SUBSYSTEM_DEF(ticker)
 		if(dynamic)
 			SSvote.initiate_vote("dynamic","server",hideresults=TRUE,votesystem=SCORE_VOTING,forced=TRUE,vote_time = 2 MINUTES)
 		else
-			SSvote.initiate_vote("roundtype","server",hideresults=TRUE,votesystem=PLURALITY_VOTING,forced=TRUE, vote_time = 2 MINUTES)
+			SSvote.initiate_vote("roundtype","server",hideresults=TRUE,votesystem=RANKED_CHOICE_VOTING,forced=TRUE, vote_time = 2 MINUTES)
 
 /datum/controller/subsystem/ticker/Recover()
 	current_state = SSticker.current_state
diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm
index 573c89a5af..2563aadf71 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -116,10 +116,8 @@ SUBSYSTEM_DEF(vote)
 				var/opposite_pref = d[j][i]
 				if(pref_number>opposite_pref)
 					p[i][j] = d[i][j]
-					p[j][i] = 0
 				else
 					p[i][j] = 0
-					p[j][i] = d[i][j]
 	for(var/i in 1 to choices.len)
 		for(var/j in 1 to choices.len)
 			if(i != j)
@@ -248,6 +246,10 @@ SUBSYSTEM_DEF(vote)
 			if("roundtype") //CIT CHANGE - adds the roundstart extended/secret vote
 				if(SSticker.current_state > GAME_STATE_PREGAME)//Don't change the mode if the round already started.
 					return message_admins("A vote has tried to change the gamemode, but the game has already started. Aborting.")
+				if(choices["secret"] > choices["extended"])
+					. = "secret"
+				else
+					. = "extended"
 				GLOB.master_mode = .
 				SSticker.save_mode(.)
 				message_admins("The gamemode has been voted for, and has been changed to: [GLOB.master_mode]")
@@ -382,6 +384,12 @@ SUBSYSTEM_DEF(vote)
 					choices |= M
 			if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote
 				choices.Add("secret", "extended")
+				var/list/modes_to_add = config.votable_modes
+				var/list/probabilities = CONFIG_GET(keyed_list/probability)
+				for(var/tag in modes_to_add)
+					if(probabilities[tag] <= 0)
+						modes_to_add -= tag
+				choices.Add(modes_to_add)
 			if("dynamic")
 				for(var/T in config.storyteller_cache)
 					var/datum/dynamic_storyteller/S = T
diff --git a/config/game_options.txt b/config/game_options.txt
index 34c8ca48fd..99d6b143f8 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -578,4 +578,7 @@ DYNAMIC_VOTING
 ## Choose which Engine to start the round with, comment to remove an Engine from the rotation
 BOX_RANDOM_ENGINE Engine SM
 BOX_RANDOM_ENGINE Engine Tesla
-BOX_RANDOM_ENGINE Engine Singulo
\ No newline at end of file
+BOX_RANDOM_ENGINE Engine Singulo
+
+## Number of modes dropped by the secret vote during mode selection, after vote.
+DROPPED_MODES 3