diff --git a/designer/designer.pp b/designer/designer.pp
index 1e275f0df1..91b38d6460 100644
--- a/designer/designer.pp
+++ b/designer/designer.pp
@@ -2985,10 +2985,10 @@ begin
   if APersistent=nil then exit;
   try
     //debugln(['TDesigner.DoDeletePersistent A ',dbgsName(APersistent),' FreeIt=',FreeIt]);
-    PopupMenuComponentEditor:=nil;
     // unselect component
     Selection.Remove(APersistent);
     if (APersistent is TComponent) then begin
+      PopupMenuComponentEditor:=nil;
       AComponent:=TComponent(APersistent);
       if csDestroying in AComponent.ComponentState then
         FreeIt:=false;