diff --git a/BizHawk.MultiClient/tools/HexEditor.Designer.cs b/BizHawk.MultiClient/tools/HexEditor.Designer.cs
index 3ff01a22cb..9936fcdbe8 100644
--- a/BizHawk.MultiClient/tools/HexEditor.Designer.cs
+++ b/BizHawk.MultiClient/tools/HexEditor.Designer.cs
@@ -539,7 +539,7 @@
 			this.vScrollBar1.Name = "vScrollBar1";
 			this.vScrollBar1.Size = new System.Drawing.Size(16, 251);
 			this.vScrollBar1.TabIndex = 1;
-			this.vScrollBar1.Scroll += new System.Windows.Forms.ScrollEventHandler(this.vScrollBar1_Scroll);
+			this.vScrollBar1.ValueChanged += new System.EventHandler(this.vScrollBar1_ValueChanged);
 			// 
 			// AddressesLabel
 			// 
diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs
index 5945d219c6..e25e370eb7 100644
--- a/BizHawk.MultiClient/tools/HexEditor.cs
+++ b/BizHawk.MultiClient/tools/HexEditor.cs
@@ -125,7 +125,6 @@ namespace BizHawk.MultiClient
 			SetDataSize(DataSize);
 			UpdateValues();
 			loaded = true;
-			AddressLabel.Text = GenerateAddressString();
 		}
 
 		private void exitToolStripMenuItem_Click(object sender, EventArgs e)
@@ -138,6 +137,7 @@ namespace BizHawk.MultiClient
 			if (!this.IsHandleCreated || this.IsDisposed) return;
 
 			AddressesLabel.Text = GenerateMemoryViewString();
+			AddressLabel.Text = GenerateAddressString();
 		}
 
 		public string GenerateAddressString()
@@ -1068,27 +1068,14 @@ namespace BizHawk.MultiClient
 		{
 			RowsVisible = ((MemoryViewerBox.Height - (fontHeight * 2) - (fontHeight / 2)) / fontHeight);
 			int totalRows = Domain.Size / 16;
-			int MaxRows = (totalRows - RowsVisible) + 16;
-
-			if (MaxRows > 0)
-			{
-				vScrollBar1.Visible = true;
-				if (vScrollBar1.Value > MaxRows)
-					vScrollBar1.Value = MaxRows;
-				vScrollBar1.Maximum = MaxRows;
-			}
-			else
-				vScrollBar1.Visible = false;
+			
+			vScrollBar1.Maximum = totalRows - 1;
+			vScrollBar1.LargeChange = RowsVisible;
+			vScrollBar1.Visible = totalRows > RowsVisible;
 
 			AddressLabel.Text = GenerateAddressString();
 		}
 
-		private void vScrollBar1_Scroll(object sender, ScrollEventArgs e)
-		{
-			this.SetUpScrollBar();
-			UpdateValues();
-		}
-
 		private int GetPointedAddress(int x, int y)
 		{
 			
@@ -1667,27 +1654,20 @@ namespace BizHawk.MultiClient
 
 		private void HexEditor_MouseWheel(object sender, MouseEventArgs e)
 		{
+			int delta = 0;
 			if (e.Delta > 0)
-			{
-				if (vScrollBar1.Value > vScrollBar1.Minimum)
-				{
-					vScrollBar1.Value--;
-					MemoryViewerBox.Refresh();
-					AddressLabel.Text = GenerateAddressString();
-					UpdateValues();
-				}
-			}
+				delta = -1;
 			else if (e.Delta < 0)
+				delta = 1;
+
+			int newValue = vScrollBar1.Value + delta;
+			if(newValue < vScrollBar1.Minimum) newValue = vScrollBar1.Minimum;
+			if(newValue > vScrollBar1.Maximum - vScrollBar1.LargeChange + 1) newValue = vScrollBar1.Maximum - vScrollBar1.LargeChange + 1;
+			if(newValue != vScrollBar1.Value)
 			{
-				if (vScrollBar1.Value < vScrollBar1.Maximum)
-				{
-					vScrollBar1.Value++;
-					MemoryViewerBox.Refresh();
-					AddressLabel.Text = GenerateAddressString();
-					UpdateValues();
-				}
+				vScrollBar1.Value = newValue;
+				MemoryViewerBox.Refresh();
 			}
-			
 		}
 
 		private void IncrementAddress()
@@ -2291,5 +2271,12 @@ namespace BizHawk.MultiClient
 		{
 			PokeAddress();
 		}
+
+		private void vScrollBar1_ValueChanged(object sender, EventArgs e)
+		{
+			UpdateValues();
+		}
+
+
 	}
 }