diff --git a/PROMS/Volian.Controls.Library/RTBItem.cs b/PROMS/Volian.Controls.Library/RTBItem.cs
index 9536707f..cc3b4be9 100644
--- a/PROMS/Volian.Controls.Library/RTBItem.cs
+++ b/PROMS/Volian.Controls.Library/RTBItem.cs
@@ -398,6 +398,8 @@ namespace Volian.Controls.Library
 		/// <param name="args"></param>
 		private void vlnExp_AttachmentClick(object sender, vlnExpanderEventArgs args)
 		{
+			if (_MyvlnExpander.AutoTOC) return;
+
 			MyStepPanel.OnAttachmentClicked(sender, new StepPanelAttachmentEventArgs(this));
 		}
 		/// <summary>
@@ -822,6 +824,7 @@ namespace Volian.Controls.Library
 					CanExpand = true;
 					// If a word document set the expander to attachment
 					_MyvlnExpander.Attachment = !(itemInfo.IsStepSection);
+					_MyvlnExpander.AutoTOC = itemInfo.IsAutoTOCSection;
 					//OLD: _MyvlnExpander.Attachment = (itemInfo.MyContent.ContentPartCount == 0);
 					break;
 				case 2: // High level steps with children can expand