diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs
index e6d45ca98b..49081d85ec 100644
--- a/BizHawk.MultiClient/MainForm.MenuItems.cs
+++ b/BizHawk.MultiClient/MainForm.MenuItems.cs
@@ -1032,6 +1032,7 @@ namespace BizHawk.MultiClient
 				cmiScreenshotClipboard.Visible = false;
 				cmiCloseRom.Visible = false;
 				cmiShowMenu.Visible = false;
+				saveMovieToolStripMenuItem1.Visible = false;
 			}
 			else
 			{
diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs
index 9e1050bc3c..f8f2b799ce 100644
--- a/BizHawk.MultiClient/tools/HexEditor.cs
+++ b/BizHawk.MultiClient/tools/HexEditor.cs
@@ -379,7 +379,10 @@ namespace BizHawk.MultiClient
 				BigEndian = false;
 			maxRow = Domain.Size / 2;
 			SetUpScrollBar();
-			vScrollBar1.Value = 0;
+			if (0 >= vScrollBar1.Minimum &&  0 <= vScrollBar1.Maximum)
+			{
+				vScrollBar1.Value = 0;
+			}
 			Refresh();
 		}