diff --git a/applications/lazstats/source/forms/analysis/nonparametric/chisqrunit.pas b/applications/lazstats/source/forms/analysis/nonparametric/chisqrunit.pas
index dae87f80b..5b8bc1352 100644
--- a/applications/lazstats/source/forms/analysis/nonparametric/chisqrunit.pas
+++ b/applications/lazstats/source/forms/analysis/nonparametric/chisqrunit.pas
@@ -759,6 +759,13 @@ var
 begin
   inherited;
 
+  if FFrequenciesReportFrame <> nil then
+    FFrequenciesReportFrame.Clear;
+  if FRowColPropsReportFrame <> nil then
+    FRowColPropsReportFrame.Clear;
+  if FCellChiSqrReportFrame <> nil then
+    FCellChiSqrReportFrame.Clear;
+
   InputGrp.ItemIndex := 0;
 
   VarList.Clear;
@@ -816,7 +823,14 @@ end;
 procedure TChiSqrFrm.UpdateBtnStates;
 begin
   inherited;
-	
+
+  if FFrequenciesReportFrame <> nil then
+    FFrequenciesReportFrame.UpdateBtnStates;
+  if FRowColPropsReportFrame <> nil then
+    FRowColPropsReportFrame.UpdateBtnStates;
+  if FCellChiSqrReportFrame <> nil then
+    FCellChiSqrReportFrame.UpdateBtnStates;
+
   RowIn.Enabled := (VarList.Items.Count > 0) and (RowEdit.Text = '');
   ColIn.Enabled := (VarList.Items.Count > 0) and (ColEdit.Text = '');
   DepIn.Enabled := (VarList.Items.Count > 0) and (DepEdit.Text = '') and (InputGrp.ItemIndex > 0);