diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs
index 37a719e8..c5cbb9e0 100644
--- a/PROMS/Volian.Controls.Library/EditItem.cs
+++ b/PROMS/Volian.Controls.Library/EditItem.cs
@@ -953,6 +953,13 @@ namespace Volian.Controls.Library
 				HandleSqlExceptionOnDelete(ex);
 				return null;
 			}
+			// B2017-159: Don't allow paste if this deleted item is in paste buffer:
+			if (MyStepPanel.MyStepTabPanel.MyDisplayTabControl.MyCopyStep != null && MyStepPanel.MyStepTabPanel.MyDisplayTabControl.MyCopyStep.ItemID == MyItemInfo.ItemID)
+			{
+				MyStepPanel.MyStepTabPanel.MyDisplayTabControl.MyCopyStep = null;
+				MyStepPanel.MyStepTabPanel.MyStepTabRibbon.SetPasteButtons(false);
+			}
+
 			// Remove EditItems
 			//_MyTimer.ActiveProcess = "RemoveFromParentsChildList";
 			RemoveFromParentsChildList();