diff --git a/BizHawk.MultiClient/PlayMovie.Designer.cs b/BizHawk.MultiClient/PlayMovie.Designer.cs
index b57c13625b..f440abee0c 100644
--- a/BizHawk.MultiClient/PlayMovie.Designer.cs
+++ b/BizHawk.MultiClient/PlayMovie.Designer.cs
@@ -121,7 +121,7 @@
             // 
             // columnHeader4
             // 
-            this.columnHeader4.Text = "Author";
+            this.columnHeader4.Text = "Length";
             this.columnHeader4.Width = 97;
             // 
             // DetailsView
diff --git a/BizHawk.MultiClient/PlayMovie.cs b/BizHawk.MultiClient/PlayMovie.cs
index 3b85f4bef8..6af7ea8577 100644
--- a/BizHawk.MultiClient/PlayMovie.cs
+++ b/BizHawk.MultiClient/PlayMovie.cs
@@ -42,7 +42,7 @@ namespace BizHawk.MultiClient
 
         private void MovieView_QueryItemBkColor(int index, int column, ref Color color)
         {
-            
+           
         }
 
         private void Cancel_Click(object sender, EventArgs e)
@@ -72,15 +72,26 @@ namespace BizHawk.MultiClient
                     return;
                 else
                 {
-                    PreLoadMovieFile(file);
-                    MovieView.ItemCount = MovieList.Count;
-                    UpdateList();
-                    MovieView.SelectedIndices.Clear();
-                    MovieView.setSelection(MovieList.Count-1);
+                    AddMovieToList(ofd.FileName);
                 }
             }
         }
 
+        private void AddMovieToList(string filename)
+        {
+            var file = new FileInfo(filename);
+            if (!file.Exists)
+                return;
+            else
+            {
+                PreLoadMovieFile(file);
+                MovieView.ItemCount = MovieList.Count;
+                UpdateList();
+                MovieView.SelectedIndices.Clear();
+                MovieView.setSelection(MovieList.Count - 1);
+            }
+        }
+
         private void PreLoadMovieFile(FileInfo path)
         {
             Movie m = new Movie(path.FullName, MOVIEMODE.INACTIVE);
@@ -105,7 +116,13 @@ namespace BizHawk.MultiClient
 
         private void PlayMovie_Load(object sender, EventArgs e)
         {
-            
+            string d = PathManager.MakeAbsolutePath(Global.Config.MoviesPath, "");
+            if (!Directory.Exists(d))
+                Directory.CreateDirectory(d);
+            foreach (string f in Directory.GetFiles(d, "*.tas"))
+            {
+                AddMovieToList(f);
+            }
         }
 
         private void MovieView_SelectedIndexChanged(object sender, EventArgs e)