diff --git a/PROMS/Volian.Controls.Library/StepTabRibbon.cs b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
index c310b324..709d1c1f 100644
--- a/PROMS/Volian.Controls.Library/StepTabRibbon.cs
+++ b/PROMS/Volian.Controls.Library/StepTabRibbon.cs
@@ -404,8 +404,11 @@ namespace Volian.Controls.Library
 				btnPasteBefore.Enabled = btnPasteAfter.Enabled = btnPasteReplace.Enabled = (MyItemInfo.IsCautionPart || MyItemInfo.IsNotePart);
 			else if (tmp.MyDisplayTabControl.MyCopyStep.IsRNOPart || tmp.MyDisplayTabControl.MyCopyStep.IsStepPart)
 				btnPasteBefore.Enabled = btnPasteAfter.Enabled = btnPasteReplace.Enabled = (MyItemInfo.IsRNOPart || MyItemInfo.IsStepPart);
-			else
-				btnPasteBefore.Enabled = btnPasteAfter.Enabled = btnPasteReplace.Enabled = tmp.MyDisplayTabControl.MyCopyStep.IsTablePart == MyItemInfo.IsTablePart;
+			else if (tmp.MyDisplayTabControl.MyCopyStep.IsTablePart == MyItemInfo.IsTablePart)
+			{
+				btnPasteBefore.Enabled = btnPasteAfter.Enabled = btnCMPasteBefore.Enabled = btnCMPasteAfter.Enabled = false;
+				btnPasteReplace.Enabled = btnCMPasteReplace.Enabled = true;
+			}
 
 			// Can't replace step with same step
 			if (tmp.MyDisplayTabControl.MyCopyStep.ItemID == MyItemInfo.ItemID) btnPasteReplace.Enabled = false;
@@ -1076,7 +1079,10 @@ namespace Volian.Controls.Library
 					break;
 				case "StepPaste":
 					displayMenu = true;
-					_ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMStepPaste);
+					if (MyFlexGrid != null)
+						_ContextMenuBar.SetContextMenuEx(MyFlexGrid, btnCMStepPaste);
+					else
+						_ContextMenuBar.SetContextMenuEx(_MyStepRTB, btnCMStepPaste);
 					break;
 			}
 			if (displayMenu)