diff --git a/BizHawk.MultiClient/PlayMovie.cs b/BizHawk.MultiClient/PlayMovie.cs
index 1f3ec706bb..27e3b30720 100644
--- a/BizHawk.MultiClient/PlayMovie.cs
+++ b/BizHawk.MultiClient/PlayMovie.cs
@@ -289,10 +289,18 @@ namespace BizHawk.MultiClient
 			string extension = "*." + Global.Config.MovieExtension;
 			foreach (string f in Directory.GetFiles(d, "*." + Global.Config.MovieExtension))
 				AddMovieToList(f, false);
-			foreach (string f in Directory.GetFiles(d, "*.tas"))
-				AddMovieToList(f, false);
-			foreach (string f in Directory.GetFiles(d, "*.bkm"))
-				AddMovieToList(f, false);
+
+			if (Global.Config.MovieExtension != "*.tas")
+			{
+				foreach (string f in Directory.GetFiles(d, "*.tas"))
+					AddMovieToList(f, false);
+			}
+			else if (Global.Config.MovieExtension != "*.bkm")
+			{
+				foreach (string f in Directory.GetFiles(d, "*.bkm"))
+					AddMovieToList(f, false);
+			}
+
 			if (Global.Config.PlayMovie_ShowStateFiles)
 			{
 				foreach (string f in Directory.GetFiles(d, "*.state"))