diff --git a/BizHawk.MultiClient/PlayMovie.Designer.cs b/BizHawk.MultiClient/PlayMovie.Designer.cs
index 8b50f35959..56b64e98c9 100644
--- a/BizHawk.MultiClient/PlayMovie.Designer.cs
+++ b/BizHawk.MultiClient/PlayMovie.Designer.cs
@@ -80,11 +80,11 @@
 			// BrowseMovies
 			// 
 			this.BrowseMovies.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.BrowseMovies.Location = new System.Drawing.Point(12, 352);
+			this.BrowseMovies.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile;
+			this.BrowseMovies.Location = new System.Drawing.Point(12, 337);
 			this.BrowseMovies.Name = "BrowseMovies";
-			this.BrowseMovies.Size = new System.Drawing.Size(75, 23);
+			this.BrowseMovies.Size = new System.Drawing.Size(31, 23);
 			this.BrowseMovies.TabIndex = 2;
-			this.BrowseMovies.Text = "Browse...";
 			this.toolTip1.SetToolTip(this.BrowseMovies, "Browse for additional movie files");
 			this.BrowseMovies.UseVisualStyleBackColor = true;
 			this.BrowseMovies.Click += new System.EventHandler(this.BrowseMovies_Click);
@@ -253,7 +253,7 @@
 			// 
 			this.Scan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.Scan.Image = global::BizHawk.MultiClient.Properties.Resources.Scan;
-			this.Scan.Location = new System.Drawing.Point(448, 337);
+			this.Scan.Location = new System.Drawing.Point(49, 337);
 			this.Scan.Name = "Scan";
 			this.Scan.Size = new System.Drawing.Size(27, 23);
 			this.Scan.TabIndex = 11;
diff --git a/BizHawk.MultiClient/PlayMovie.cs b/BizHawk.MultiClient/PlayMovie.cs
index 79f85a4c6c..27c03f7a28 100644
--- a/BizHawk.MultiClient/PlayMovie.cs
+++ b/BizHawk.MultiClient/PlayMovie.cs
@@ -69,7 +69,7 @@ namespace BizHawk.MultiClient
 		{
 			OpenFileDialog ofd = new OpenFileDialog();
 			ofd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.MoviesPath, "");
-			ofd.Filter = "Movie files (*.tas)|*.TAS;*.ZIP;*.7z|FCEUX Movies|*.FM2|PCEjin Movies|*.MC2|Archive Files|*.zip;*.7z|All Files|*.*";
+			ofd.Filter = "Movie files (*.tas)|*.TAS;*.ZIP;*.7z|FCEUX Movies|*.FM2|PCEjin Movies|*.MC2|Savestates|*.state|Archive Files|*.zip;*.7z|All Files|*.*";
 
 			Global.Sound.StopSound();
 			var result = ofd.ShowDialog();
@@ -81,6 +81,17 @@ namespace BizHawk.MultiClient
 					return;
 				else
 				{
+					if (file.Extension.ToUpper() == "STATE")
+					{
+						Movie m = new Movie(file.FullName, MOVIEMODE.INACTIVE);
+						m.LoadMovie(); //State files will have to load everything unfortunately
+						if (m.Length() == 0)
+						{
+							MessageBox.Show("No input log detected in this savestate, aborting", "Can not load file", MessageBoxButtons.OK, MessageBoxIcon.Hand);
+							return;
+						}
+					}
+
 					int x = AddMovieToList(ofd.FileName);
 					if (x > 0)
 					{
@@ -295,7 +306,13 @@ namespace BizHawk.MultiClient
 		private void MovieView_SelectedIndexChanged(object sender, EventArgs e)
 		{
 			DetailsView.Items.Clear();
-			if (MovieView.SelectedIndices.Count < 1) return;
+			if (MovieView.SelectedIndices.Count < 1)
+			{
+				OK.Enabled = false;
+				return;
+			}
+			else
+				OK.Enabled = true;
 
 			int x = MovieView.SelectedIndices[0];
 			Dictionary<string, string> h = MovieList[x].Header.HeaderParams;