diff --git a/components/projectgroups/projectgroupeditor.pas b/components/projectgroups/projectgroupeditor.pas
index 31293db0b7..0aaa5f57d8 100644
--- a/components/projectgroups/projectgroupeditor.pas
+++ b/components/projectgroups/projectgroupeditor.pas
@@ -669,7 +669,7 @@ Var
   T: TPGCompileTarget;
 begin
   T:=SelectedTarget;
-  Result:=Assigned(T) and (ATargetAction in T.AllowedActions);
+  Result:=Assigned(T) and (not T.Removed) and (ATargetAction in T.AllowedActions);
   If Assigned(AAction) then
     AAction.Enabled:=Result;
 end;
@@ -736,7 +736,8 @@ var
   ND: TNodeData;
 begin
   ND:=SelectedNodeData;
-  (Sender as TAction).Enabled:=(ND<>nil) and (ND.NodeType in [ntTarget,ntProjectGroup,ntFile]);
+  (Sender as TAction).Enabled:=(ND<>nil)
+    and ((ND.Target<>nil) or (ND.NodeType in [ntFile]));
   UpdateIDEMenuCommandFromAction(Sender,cmdTargetCopyFilename);
 end;