diff --git a/BizHawk.MultiClient/JMDWriter.cs b/BizHawk.MultiClient/JMDWriter.cs
index 51e6722636..d3d1baa240 100644
--- a/BizHawk.MultiClient/JMDWriter.cs
+++ b/BizHawk.MultiClient/JMDWriter.cs
@@ -181,7 +181,7 @@ namespace BizHawk.MultiClient
         public void OpenFile(string baseName)
         {
             string ext = Path.GetExtension(baseName);
-            if (ext == null || ext.ToLower() != "jmd")
+            if (ext == null || ext.ToLower() != ".jmd")
                 baseName = baseName + ".jmd";
 
             JMDfile = File.Open(baseName, FileMode.OpenOrCreate);
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index a56ff3eab4..0a4b5925c2 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -2656,7 +2656,7 @@ namespace BizHawk.MultiClient
 				sfd.FileName = "NULL";
 				sfd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.AVIPath, "");
 			}
-			sfd.Filter = "AVI (*.avi)|*.avi|All Files|*.*";
+			sfd.Filter = "AVI (*.avi)|*.avi|JMD (*.jmd)|*.jmd|All Files|*.*";
 			Global.Sound.StopSound();
 			var result = sfd.ShowDialog();
 			Global.Sound.StartSound();
@@ -2666,7 +2666,16 @@ namespace BizHawk.MultiClient
 
 			//TODO - cores should be able to specify exact values for these instead of relying on this to calculate them
 			int fps = (int)(Global.Emulator.CoreOutputComm.VsyncRate * 0x01000000);
-            IVideoWriter aw = new AviWriter(); // new JMDWriter();
+
+            IVideoWriter aw;
+            string ext = Path.GetExtension(sfd.FileName).ToLower();
+
+            if (ext == ".jmd")
+                aw = new JMDWriter();
+            else if (ext == ".avi")
+                aw = new AviWriter();
+            else // hmm?
+                aw = new AviWriter();
 			try
 			{
 				aw.SetMovieParameters(fps, 0x01000000);