diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
index 53d9e19f..1f7825ea 100644
--- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
@@ -2128,10 +2128,15 @@ namespace Volian.Controls.Library
 					displayMenu = btnCMInsHLS.Enabled;
 					Cursor.Position = new Point(0, 0); // Enter Key hit, move mouse pointer out of way of context menu
 					_ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMInsHLS);
+					string lookfor = "XXX";
+					if(_MyStepRTB.MyItemInfo.MyHLS != null)
+						lookfor = " " + (_MyStepRTB.MyItemInfo.MyHLS.MyContent.Type - 20000).ToString();
 					foreach (DevComponents.DotNetBar.ButtonItem bi in btnCMInsHLS.SubItems)
 					{
 						if (bi.Checked)
 							moveDown = cnt;
+						if(((string) bi.Tag).EndsWith(lookfor))
+							moveDown = cnt;
 						cnt++;
 					}
  					break;
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index d5a835ba..04651fa6 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -2290,8 +2290,9 @@ namespace Volian.Print.Library
 								else
 								{
 									SectionConfig sc = itemInfo.MyParent.MyConfig as SectionConfig;
-									offset = (sc != null && sc.SubSection_AutoIndent == "Y") ? MyParent.XOffset 
-										: (MyParent != null && MyParent.MyTab != null)?MyParent.MyTab.XOffset:XOffset;
+									if (MyParent != null)
+										offset = (sc != null && sc.SubSection_AutoIndent == "Y") ? MyParent.XOffset 
+											: (MyParent.MyTab != null)?MyParent.MyTab.XOffset:XOffset;
 								}
 							}
 							else