diff --git a/client/source/DelphiLint.SetupForm.pas b/client/source/DelphiLint.SetupForm.pas
index 2d22932..8eef07c 100644
--- a/client/source/DelphiLint.SetupForm.pas
+++ b/client/source/DelphiLint.SetupForm.pas
@@ -170,7 +170,7 @@ procedure TLintSetupForm.RefreshTheme;
 
 procedure TLintSetupForm.FormCloseQuery(Sender: TObject; var CanClose: Boolean);
 begin
-  if FSaved then begin
+  if FSaved or IsSetupValid then begin
     CanClose := True;
     Exit;
   end;