diff --git a/aegisub/src/command/audio.cpp b/aegisub/src/command/audio.cpp
index 975ceacf8..35e624baf 100644
--- a/aegisub/src/command/audio.cpp
+++ b/aegisub/src/command/audio.cpp
@@ -94,8 +94,8 @@ struct audio_open : public Command {
 	void operator()(agi::Context *c) {
 		try {
 			wxString path = lagi_wxString(OPT_GET("Path/Last/Audio")->GetString());  
-			wxString str = wxString(_("Audio Formats")) + " (*.wav,*.mp3,*.ogg,*.flac,*.mp4,*.ac3,*.aac,*.mka,*.m4a,*.w64)|*.wav;*.mp3;*.ogg;*.flac;*.mp4;*.ac3;*.aac;*.mka;*.m4a;*.w64|"
-						+ _("Video Formats") + " (*.avi,*.mkv,*.ogm,*.mpg,*.mpeg)|*.avi;*.mkv;*.ogm;*.mp4;*.mpeg;*.mpg|"
+			wxString str = _("Audio Formats") + " (*.aac,*.ac3,*.ape,*.dts,*.flac,*.m4a,*.mka,*.mp3,*.mp4,*.ogg,*.w64,*.wav,*.wma)|*.aac;*.ac3;*.ape;*.dts;*.flac;*.m4a;*.mka;*.mp3;*.mp4;*.ogg;*.w64;*.wav;*.wma|"
+						+ _("Video Formats") + " (*.asf,*.avi,*.avs,*.d2v,*.m2ts,*.mkv,*.mov,*.mov,*.mp4,*.mpeg,*.mpg,*.ogm,*.wmv,*.ts)|*.asf;*.avi;*.avs;*.d2v;*.m2ts;*.mkv;*.mov;*.mov;*.mp4;*.mpeg;*.mpg;*.ogm;*.wmv;*.ts|"
 						+ _("All Files") + " (*.*)|*.*";
 			wxString filename = wxFileSelector(_("Open Audio File"),path,"","",str,wxFD_OPEN | wxFD_FILE_MUST_EXIST);
 			if (!filename.empty()) {
diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp
index 42455410b..c0109430e 100644
--- a/aegisub/src/command/video.cpp
+++ b/aegisub/src/command/video.cpp
@@ -594,7 +594,7 @@ struct video_open : public Command {
 
 	void operator()(agi::Context *c) {
 		wxString path = lagi_wxString(OPT_GET("Path/Last/Video")->GetString());
-		wxString str = wxString(_("Video Formats")) + " (*.avi,*.mkv,*.mp4,*.avs,*.d2v,*.ogm,*.mpeg,*.mpg,*.vob,*.mov)|*.avi;*.avs;*.d2v;*.mkv;*.ogm;*.mp4;*.mpeg;*.mpg;*.vob;*.mov|"
+		wxString str = _("Video Formats") + " (*.asf,*.avi,*.avs,*.d2v,*.m2ts,*.mkv,*.mov,*.mov,*.mp4,*.mpeg,*.mpg,*.ogm,*.wmv,*.ts,*.y4m,*.yuv)|*.asf;*.avi;*.avs;*.d2v;*.m2ts;*.mkv;*.mov;*.mov;*.mp4;*.mpeg;*.mpg;*.ogm;*.wmv;*.ts;*.y4m;*.yuv|"
 					 + _("All Files") + " (*.*)|*.*";
 		wxString filename = wxFileSelector(_("Open video file"),path,"","",str,wxFD_OPEN | wxFD_FILE_MUST_EXIST);
 		if (!filename.empty()) {
diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp
index ea398cab0..43241c101 100644
--- a/aegisub/src/frame_main.cpp
+++ b/aegisub/src/frame_main.cpp
@@ -443,18 +443,22 @@ bool FrameMain::LoadList(wxArrayString list) {
 
 	// Video formats
 	wxArrayString videoList;
-	videoList.Add("avi");
-	videoList.Add("mkv");
-	videoList.Add("mp4");
-	videoList.Add("d2v");
-	videoList.Add("mpg");
-	videoList.Add("mpeg");
-	videoList.Add("ogm");
-	videoList.Add("avs");
-	videoList.Add("wmv");
 	videoList.Add("asf");
+	videoList.Add("avi");
+	videoList.Add("avs");
+	videoList.Add("d2v");
+	videoList.Add("m2ts");
+	videoList.Add("mkv");
 	videoList.Add("mov");
+	videoList.Add("mov");
+	videoList.Add("mp4");
+	videoList.Add("mpeg");
+	videoList.Add("mpg");
+	videoList.Add("ogm");
 	videoList.Add("rm");
+	videoList.Add("rmvb");
+	videoList.Add("wmv");
+	videoList.Add("ts");
 	videoList.Add("y4m");
 	videoList.Add("yuv");
 
@@ -469,17 +473,18 @@ bool FrameMain::LoadList(wxArrayString list) {
 
 	// Audio formats
 	wxArrayString audioList;
-	audioList.Add("wav");
+	audioList.Add("aac");
+	audioList.Add("ac3");
+	audioList.Add("ape");
+	audioList.Add("dts");
+	audioList.Add("flac");
+	audioList.Add("m4a");
+	audioList.Add("mka");
 	audioList.Add("mp3");
 	audioList.Add("ogg");
+	audioList.Add("w64");
+	audioList.Add("wav");
 	audioList.Add("wma");
-	audioList.Add("ac3");
-	audioList.Add("aac");
-	audioList.Add("mpc");
-	audioList.Add("ape");
-	audioList.Add("flac");
-	audioList.Add("mka");
-	audioList.Add("m4a");
 
 	// Scan list
 	wxString audio;