diff --git a/designer/askcompnamedlg.pas b/designer/askcompnamedlg.pas
index 84cfe4485f..ff7d3a4af6 100644
--- a/designer/askcompnamedlg.pas
+++ b/designer/askcompnamedlg.pas
@@ -219,7 +219,8 @@ begin
   if (Key=VK_RETURN) and (ssCtrl in Shift) then
   begin
     Key := 0;
-    ButtonPanel1.OKButton.Click;
+    if ButtonPanel1.OKButton.Enabled then
+      ButtonPanel1.OKButton.Click;
   end;
 end;