diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs
index 6e3ef415..cfad90c8 100644
--- a/PROMS/Volian.Controls.Library/EditItem.cs
+++ b/PROMS/Volian.Controls.Library/EditItem.cs
@@ -222,7 +222,7 @@ namespace Volian.Controls.Library
 		//private string _LastMethod = "";
 		internal void LastMethodsPush(string str)
 		{
-			MyStepPanel._LastAdjust = str;
+			if(MyStepPanel != null)MyStepPanel._LastAdjust = str;
 			_LastMethods.Push(str);
 		}
 		internal string LastMethodsPop()
diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs
index 1246e592..3b7e5756 100644
--- a/PROMS/Volian.Controls.Library/StepRTB.cs
+++ b/PROMS/Volian.Controls.Library/StepRTB.cs
@@ -1076,7 +1076,11 @@ namespace Volian.Controls.Library
 					this.Size = szNew;
 					//Console.WriteLine("after {0}, {1}, {2}, {3}", Size, szNew, widthNew, Width);
 					if (heightOld != Height)
+					{
 						OnHeightChanged(this, new EventArgs());
+						if (ScrollPos.Y != 0) // Adjust ScrollPosition if it isn't Zero
+							ScrollPos = new Point(0, 0);
+					}
 				}
 			}
 		}