diff --git a/PROMS/Volian.Controls.Library/EditItem.cs b/PROMS/Volian.Controls.Library/EditItem.cs
index 0f15f76e..ff79e8dc 100644
--- a/PROMS/Volian.Controls.Library/EditItem.cs
+++ b/PROMS/Volian.Controls.Library/EditItem.cs
@@ -866,6 +866,7 @@ namespace Volian.Controls.Library
 				}
 			}
 			BeingRemoved = true;
+			EditItem tmpSelEI = MyStepPanel.SelectedEditItem;       // B2021-002: if can't remove, reset SelectedEditItem
 			MyStepPanel.SelectedEditItem = null; // Unselect the item to be deleted
 			//ShowTops("\r\n");
 			int TopMostYBefore = TopMostEditItem.Top;
@@ -880,6 +881,7 @@ namespace Volian.Controls.Library
 			if (newFocus == null)
 			{
 				MyStepPanel.Controls.Remove(pnl);
+				MyStepPanel.SelectedEditItem = tmpSelEI;        // B2021-002: if can't remove, reset SelectedEditItem
 				return;
 			}
 			//_MyTimer.ActiveProcess = "SetFocus";