diff --git a/PROMS/Volian.Controls.Library/GridItem.cs b/PROMS/Volian.Controls.Library/GridItem.cs
index c465f63a..283a276b 100644
--- a/PROMS/Volian.Controls.Library/GridItem.cs
+++ b/PROMS/Volian.Controls.Library/GridItem.cs
@@ -342,7 +342,7 @@ namespace Volian.Controls.Library
 
 		void MyStepRTB_OpenContextMenu(object sender, StepRTBLocationEventArgs args)
 		{
-			MyStepPanel.MyStepTabPanel.MyStepTabRibbon.OpenContextMenu(args.Location);
+			MyStepPanel.MyStepTabPanel.MyStepTabRibbon.OpenContextMenu(args.Location, sender);
 		}
 
 		void MyStepRTB_SetMenu(object sender, StepRTBMenuEventArgs args)
diff --git a/PROMS/Volian.Controls.Library/RTBItem.cs b/PROMS/Volian.Controls.Library/RTBItem.cs
index ea2f1dea..7371c8dc 100644
--- a/PROMS/Volian.Controls.Library/RTBItem.cs
+++ b/PROMS/Volian.Controls.Library/RTBItem.cs
@@ -584,7 +584,7 @@ namespace Volian.Controls.Library
 			if (args.MenuGroup == null)
 				MyStepPanel.MyStepTabPanel.MyStepTabRibbon.ClearContextMenu();
 			else if (args.MenuGroup == "OpenContextMenu")
-				MyStepPanel.MyStepTabPanel.MyStepTabRibbon.SetContextMenu();
+				MyStepPanel.MyStepTabPanel.MyStepTabRibbon.SetContextMenu(sender);
 			else
 				MyStepPanel.MyStepTabPanel.MyStepTabRibbon.SetShortCutContextMenu(args.MenuGroup);
 		}
@@ -708,7 +708,7 @@ namespace Volian.Controls.Library
 		}
 		void _MyStepRTB_OpenContextMenu(object sender, StepRTBLocationEventArgs args)
 		{
-			MyStepPanel.MyStepTabPanel.MyStepTabRibbon.OpenContextMenu(args.Location);
+			MyStepPanel.MyStepTabPanel.MyStepTabRibbon.OpenContextMenu(args.Location, sender);
 		}
 		void _MyStepRTB_DoMouseWheel(object sender, System.Windows.Forms.MouseEventArgs args)
 		{
diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
index 53e0347a..8d3ed4ed 100644
--- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
@@ -119,14 +119,14 @@ namespace Volian.Controls.Library
 		#region Save ROs from Word Document jcb 20121221
 		private string MyLookupData;
 		private Dictionary<string, string> MyAvailableROs;
-		public void SetContextMenu()
+		public void SetContextMenu(object sender)
 		{
-			AddEnhancedDocumentMenu(btnCMRtfEdit);
+			AddEnhancedDocumentMenu(btnCMRtfEdit, sender);
 			AddWROContext(btnCMRtfEdit);
 			_ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMRtfEdit);
 		}
 
-		private void AddEnhancedDocumentMenu(DevComponents.DotNetBar.ButtonItem myButtonItem)
+		private void AddEnhancedDocumentMenu(DevComponents.DotNetBar.ButtonItem myButtonItem, object sender)
 		{
 			// get a list of all of the current enhanced buttons that been defined for context menu
 			List<string> unusedEnhancedButtons = new List<string>();
@@ -136,7 +136,8 @@ namespace Volian.Controls.Library
 
 			// for all enhanced documents, get the list of buttons as they should be for the
 			// selected step
-			StepConfig sc = new StepConfig(_MyStepRTB.MyItemInfo.MyContent.Config);
+			StepRTB myStepRTB = sender as StepRTB ?? _MyStepRTB;
+			StepConfig sc = new StepConfig(myStepRTB.MyItemInfo.MyContent.Config);
 			DVEnhancedDocuments dveds = MyItemInfo.MyDocVersion.DocVersionConfig.MyEnhancedDocuments;
 			foreach(EnhancedDocument ed in sc.MyEnhancedDocuments)
 			{
@@ -412,9 +413,9 @@ namespace Volian.Controls.Library
 			if (rtabTableGridTools.Visible)
 				_ContextMenuBar.SetContextMenuEx(MyFlexGrid, btnCMGrid);
 		}
-		public void OpenContextMenu(Point loc)
+		public void OpenContextMenu(Point loc, object sender)
 		{
-			AddEnhancedDocumentMenu(btnCMRtfEdit);
+			AddEnhancedDocumentMenu(btnCMRtfEdit,sender);
 			btnCMRtfEdit.Popup(loc);
 		}
 		private int _MyLastFormatID = -1;