diff --git a/components/jcf2/Ui/Settings/frWarnings.lfm b/components/jcf2/Ui/Settings/frWarnings.lfm
index f0ba233204..fad642149a 100644
--- a/components/jcf2/Ui/Settings/frWarnings.lfm
+++ b/components/jcf2/Ui/Settings/frWarnings.lfm
@@ -28,6 +28,7 @@ inherited fWarnings: TfWarnings
     Width = 80
     BorderSpacing.Around = 6
     Caption = '&Warnings On'
+    OnChange = cbWarningsOnChange
     TabOrder = 0
   end
   object cbWarnUnusedParams: TCheckBox[2]
@@ -40,6 +41,7 @@ inherited fWarnings: TfWarnings
     Width = 140
     BorderSpacing.Around = 6
     Caption = 'Warn &unused parameters'
+    OnChange = cbWarnUnusedParamsChange
     TabOrder = 1
   end
   object mIgnoreUnusedParams: TMemo[3]
diff --git a/components/jcf2/Ui/Settings/frWarnings.pas b/components/jcf2/Ui/Settings/frWarnings.pas
index 1b5f74248e..f0d6c4389b 100644
--- a/components/jcf2/Ui/Settings/frWarnings.pas
+++ b/components/jcf2/Ui/Settings/frWarnings.pas
@@ -44,6 +44,8 @@ type
     cbWarnUnusedParams: TCheckBox;
     mIgnoreUnusedParams: TMemo;
     Label1: TLabel;
+    procedure cbWarningsOnChange(Sender: TObject);
+    procedure cbWarnUnusedParamsChange(Sender: TObject);
     procedure FrameResize(Sender: TObject);
   public
     constructor Create(AOwner: TComponent); override;
@@ -78,6 +80,7 @@ begin
   cbWarningsOn.Caption := lisWarningsWarningsOn;
   cbWarnUnusedParams.Caption := lisWarningsWarnAboutUnusedParameters;
   Label1.Caption := lisWarningsIgnoreUnusedParametersNamed;
+  cbWarningsOnChange(cbWarningsOn);
 end;
 
 procedure TfWarnings.ReadSettings(AOptions: TAbstractIDEOptions);
@@ -87,7 +90,6 @@ begin
     cbWarningsOn.Checked := Warnings;
     cbWarnUnusedParams.Checked  := WarnUnusedParams;
     mIgnoreUnusedParams.Lines.Assign(IgnoreUnusedParams);
-
   end;
 end;
 
@@ -112,10 +114,26 @@ const
   PAD = 6;
 begin
   inherited;
-
   mIgnoreUnusedParams.Height := ClientHeight - (mIgnoreUnusedParams.Top + PAD);
 end;
 
+procedure TfWarnings.cbWarningsOnChange(Sender: TObject);
+var
+  b: Boolean;
+begin
+  b := (Sender as TCheckBox).Checked;
+  cbWarnUnusedParams.Enabled := b;
+  mIgnoreUnusedParams.Enabled := b and cbWarnUnusedParams.Checked;
+end;
+
+procedure TfWarnings.cbWarnUnusedParamsChange(Sender: TObject);
+var
+  b: Boolean;
+begin
+  b := (Sender as TCheckBox).Checked;
+  mIgnoreUnusedParams.Enabled := b;
+end;
+
 initialization
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfWarnings, JCFOptionWarnings, JCFOptionClarify);
 end.