diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 06022bcce1..0ca98317a9 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -1265,51 +1265,13 @@ namespace BizHawk.MultiClient
 				case "A26": str += "Atari 2600"; break;
 				case "A78": str += "Atari 7800"; break;
 				case "C64": str += "Commodore 64"; break;
+				case "Coleco": str += "ColecoVision"; break;
 			}
 
 			if (INTERIM) str += " (interim)";
 			return str;
 		}
 
-		public string GetMovieExtName()
-		{
-			string str = "", system = Global.Game.System, ext = GetAlternateExt();
-			switch (system)
-			{
-				case "SG": str += "SG-1000"; break;
-				case "SMS": str += "Sega Master System"; break;
-				case "GG": str += "Game Gear"; break;
-				case "PCECD": str += "TurboGrafx-16 (CD)"; break;
-				case "PCE": str += "TurboGrafx-16"; break;
-				case "SGX": str += "SuperGrafx"; break;
-				case "GEN": str += "Genesis"; break;
-				case "TI83": str += "TI-83"; break;
-				case "NES": str += "NES"; break;
-				case "GB": str += "Game Boy"; break;
-			}
-			return str + " Movie File (*" + ext + ")|*" + ext;
-		}
-
-		private string GetAlternateExt()
-		{
-			string str = ".", system = Global.Game.System;
-			switch (system)
-			{
-				case "SG": str += "1000"; break;
-				case "SMS": str += "sms"; break;
-				case "GG": str += "gg"; break;
-				case "PCECD": str += "pcecd"; break;
-				case "PCE": str += "pce"; break;
-				case "SGX": str += "sgx"; break;
-				case "GEN": str += "gen"; break;
-				case "TI83": str += "ti83"; break;
-				case "NES": str += "nes"; break;
-				case "GB": str += "gb"; break;
-			}
-
-			return str + "." + Global.Config.MovieExtension;
-		}
-
 		private void HandlePlatformMenus()
 		{
 			string system = "";
diff --git a/BizHawk.MultiClient/PlayMovie.cs b/BizHawk.MultiClient/PlayMovie.cs
index c996cb5ee2..93b1bc42d4 100644
--- a/BizHawk.MultiClient/PlayMovie.cs
+++ b/BizHawk.MultiClient/PlayMovie.cs
@@ -80,7 +80,8 @@ namespace BizHawk.MultiClient
 		{
 			OpenFileDialog ofd = new OpenFileDialog();
 			ofd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.MoviesPath, "");
-			ofd.Filter = "Generic Movie Files (*." + Global.Config.MovieExtension + ")|*." + Global.Config.MovieExtension + ";*.zip;*.7z|" + Global.MainForm.GetMovieExtName() + "|Savestates|*.state|Archive Files|*.zip;*.7z|All Files|*.*";
+			string filter = "Movie Files (*." + Global.Config.MovieExtension + ")|*." + Global.Config.MovieExtension + "|Savestates|*.state|All Files|*.*";
+			ofd.Filter = filter;
 
 			Global.Sound.StopSound();
 			var result = ofd.ShowDialog();
diff --git a/BizHawk.MultiClient/RecordMovie.cs b/BizHawk.MultiClient/RecordMovie.cs
index fe834c6192..25b9381705 100644
--- a/BizHawk.MultiClient/RecordMovie.cs
+++ b/BizHawk.MultiClient/RecordMovie.cs
@@ -165,7 +165,8 @@ namespace BizHawk.MultiClient
 			sfd.DefaultExt = "." + Global.Config.MovieExtension;
 			sfd.FileName = RecordBox.Text;
 			sfd.OverwritePrompt = false;
-			sfd.Filter = "Generic Movie Files (*." + Global.Config.MovieExtension + ")|*." + Global.Config.MovieExtension + "|" + Global.MainForm.GetMovieExtName() + "|All Files (*.*)|*.*";
+			string filter = "Movie Files (*." + Global.Config.MovieExtension + ")|*." + Global.Config.MovieExtension + "|Savestates|*.state|All Files|*.*";
+			sfd.Filter = filter;
 
 			Global.Sound.StopSound();
 			var result = sfd.ShowDialog();
diff --git a/BizHawk.MultiClient/tools/TAStudio.cs b/BizHawk.MultiClient/tools/TAStudio.cs
index 9ab61e8095..6751bf30df 100644
--- a/BizHawk.MultiClient/tools/TAStudio.cs
+++ b/BizHawk.MultiClient/tools/TAStudio.cs
@@ -443,9 +443,9 @@ namespace BizHawk.MultiClient
 			SaveFileDialog sfd = new SaveFileDialog();
 			sfd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.MoviesPath, "");
 			sfd.DefaultExt = "." + Global.Config.MovieExtension;
-			//sfd.FileName = RecordBox.Text;
 			sfd.FileName = Global.MovieSession.Movie.Filename;
-			sfd.Filter = "Generic Movie Files (*." + Global.Config.MovieExtension + ")|*." + Global.Config.MovieExtension + "|" + Global.MainForm.GetMovieExtName() + "|All Files (*.*)|*.*";
+			string filter = "Movie Files (*." + Global.Config.MovieExtension + ")|*." + Global.Config.MovieExtension + "|Savestates|*.state|All Files|*.*";
+			sfd.Filter = filter;
 
 			Global.Sound.StopSound();
 			var result = sfd.ShowDialog();