diff --git a/db/factories/momentum.txt b/db/factories/momentum.txt
index 7a7530041..26c25d9f4 100644
--- a/db/factories/momentum.txt
+++ b/db/factories/momentum.txt
@@ -92,6 +92,7 @@ filter_activator_model
 filter_activator_name
 filter_base
 filter_momentum_collectibles
+filter_momentum_gamemode
 filter_momentum_surface_collision
 filter_momentum_timer_progress
 filter_multi
diff --git a/fgd/bases/GameTypes.fgd b/fgd/bases/Gamemodes.fgd
similarity index 69%
rename from fgd/bases/GameTypes.fgd
rename to fgd/bases/Gamemodes.fgd
index bdfbf68da..13b2edb9b 100644
--- a/fgd/bases/GameTypes.fgd
+++ b/fgd/bases/Gamemodes.fgd
@@ -1,9 +1,9 @@
 @BaseClass
 	appliesto(MOMENTUM)
-= GameTypes
+= Gamemodes
 	[
-	gametype[engine](integer) : "Game Type" : 0
-	gametype(choices) : "Game Type" : 0 : "The game type of the map." =
+	gamemode[engine](integer) : "Gamemode" : 0
+	gamemode(choices) : "Gamemode" : 0 =
 		[
 		0 : "Unknown"
 		1 : "Surf"
diff --git a/fgd/point/filter/filter_momentum_gamemode.fgd b/fgd/point/filter/filter_momentum_gamemode.fgd
new file mode 100644
index 000000000..71b3eb2b8
--- /dev/null
+++ b/fgd/point/filter/filter_momentum_gamemode.fgd
@@ -0,0 +1,5 @@
+@FilterClass base(filter_base, Gamemodes)
+	appliesto(MOMENTUM)
+= filter_momentum_gamemode : "A filter that filters by the current gamemode."
+	[
+	]
diff --git a/fgd/visgroups.cfg b/fgd/visgroups.cfg
index 5b536ca98..6cff96de2 100644
--- a/fgd/visgroups.cfg
+++ b/fgd/visgroups.cfg
@@ -460,6 +460,7 @@
 			* `filter_multi`
 			* `filter_player_held`
 			* `filter_momentum_collectibles`
+			* `filter_momentum_gamemode`
 			* `filter_momentum_surface_collision`
 			* `filter_momentum_timer_progress`
 			* `filter_paint_power`