diff --git a/PROMS/Volian.Controls.Library/RTBItem.cs b/PROMS/Volian.Controls.Library/RTBItem.cs
index 06867163..2c9de3ee 100644
--- a/PROMS/Volian.Controls.Library/RTBItem.cs
+++ b/PROMS/Volian.Controls.Library/RTBItem.cs
@@ -460,7 +460,12 @@ namespace Volian.Controls.Library
 			Cursor tmp = Cursor.Current;
 			Cursor.Current = Cursors.WaitCursor;
 			if (!_Loading && MyExpandingStatus == ExpandingStatus.No)
-				Expand((ContentType >= 20000) || MyItemInfo.ActiveFormat.MyStepSectionLayoutData.Dev_Format);
+			{
+				if (MyStepPanel.AutoExpand)
+					Expand((ContentType >= 20000) || MyItemInfo.ActiveFormat.MyStepSectionLayoutData.Dev_Format);
+				else
+					Expand(false);
+			}
 			Cursor.Current = tmp;
 		}
 
diff --git a/PROMS/Volian.Controls.Library/StepPanel.cs b/PROMS/Volian.Controls.Library/StepPanel.cs
index 243e0ea8..d4a5eb7a 100644
--- a/PROMS/Volian.Controls.Library/StepPanel.cs
+++ b/PROMS/Volian.Controls.Library/StepPanel.cs
@@ -359,7 +359,9 @@ namespace Volian.Controls.Library
 			get
 			{
 				// This is temporary to get the code working for this particular procedure
-				return MyProcedureItemInfo.DisplayNumber != "PMS-810";
+				if (MyProcedureItemInfo.DisplayNumber == "PMS-810") return false;
+				if (MyProcedureItemInfo.DisplayNumber == "PMS-809") return false;
+				return true;
 			}
 		}
 		public void Reset()