diff --git a/.gitignore b/.gitignore
index bdf187e5111..f12223e2c4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *.log
 *.int
 *.rsc
-*.dmb
\ No newline at end of file
+*.dmb
+*.lk
+info.json
\ No newline at end of file
diff --git a/code/game/vote.dm b/code/game/vote.dm
index 93155476e47..1307349a05b 100644
--- a/code/game/vote.dm
+++ b/code/game/vote.dm
@@ -59,7 +59,7 @@
 	calcwin()
 
 	if(mode)
-		if(!ticker)
+		if(ticker.current_state == GAME_STATE_PREGAME)
 			if(!going)
 				world << "<B>The game will start soon.</B>"
 				going = 1
@@ -74,7 +74,7 @@
 		world << "Result is change to \red [wintext]"
 		world.save_mode(winner)
 
-		if(ticker.current_state != 1)
+		if(ticker.current_state != GAME_STATE_PREGAME)
 			world <<"\red <B>World will reboot in 10 seconds</B>"
 
 			feedback_set_details("end_error","mode vote - [winner]")
@@ -262,7 +262,9 @@
 
 		if(!vote.canvote())		// not time to vote yet
 			if(config.allow_vote_restart) text+="Voting to restart is enabled.<BR>"
-			if(config.allow_vote_mode) text+="Voting to change mode is enabled.<BR>"
+			if(config.allow_vote_mode)
+				if(ticker.current_state == GAME_STATE_PREGAME) text+="Voting to change mode is enabled.<BR>"
+				else text =+ "Change mode votes are disabled while a round is in progress, vote to restart first.<BR>"
 
 			text+="<BR><P>Next vote can begin in [vote.nextwait()]."
 			text+=footer
@@ -273,7 +275,10 @@
 			if(config.allow_vote_restart)
 				text += "<A href='?src=\ref[vote];voter=\ref[src];vmode=1'>Begin restart vote.</A><BR>"
 			if(config.allow_vote_mode)
-				text += "<A href='?src=\ref[vote];voter=\ref[src];vmode=2'>Begin change mode vote.</A><BR>"
+				if(ticker.current_state == GAME_STATE_PREGAME)
+					text += "<A href='?src=\ref[vote];voter=\ref[src];vmode=2'>Begin change mode vote.</A><BR>"
+				else
+					text =+ "Change mode votes are disabled while a round is in progress, vote to restart first.<BR>"
 
 			text += footer
 			usr << browse(text, "window=vote")