diff --git a/components/rx/trunk/rxcloseformvalidator.pas b/components/rx/trunk/rxcloseformvalidator.pas
index d9f919a87..e031419dc 100644
--- a/components/rx/trunk/rxcloseformvalidator.pas
+++ b/components/rx/trunk/rxcloseformvalidator.pas
@@ -305,9 +305,10 @@ begin
   begin
     if TForm(Sender).ModalResult = mrOk then
     begin
-     CanClose:=CheckCloseForm;
      if CanClose and Assigned(FOnCloseQuery) then
        FOnCloseQuery(Sender, CanClose);
+     if CanClose then
+       CanClose:=CheckCloseForm;
     end;
   end;
 end;