diff --git a/ide/genericchecklist.lfm b/ide/genericchecklist.lfm
index c310388789..d886c4848e 100644
--- a/ide/genericchecklist.lfm
+++ b/ide/genericchecklist.lfm
@@ -1,22 +1,24 @@
 object GenericCheckListForm: TGenericCheckListForm
   Left = 389
-  Height = 277
+  Height = 282
   Top = 463
-  Width = 343
+  Width = 351
   ActiveControl = CheckListBox1
   Caption = 'GenericCheckListForm'
-  ClientHeight = 277
-  ClientWidth = 343
+  ClientHeight = 282
+  ClientWidth = 351
+  Constraints.MinHeight = 200
+  Constraints.MinWidth = 260
   KeyPreview = True
   Position = poScreenCenter
-  LCLVersion = '3.99.0.0'
+  LCLVersion = '4.99.0.0'
   OnKeyDown = FormKeyDown
   OnShow = FormShow
   object ButtonPanel1: TButtonPanel
     Left = 6
-    Height = 26
-    Top = 245
-    Width = 331
+    Height = 29
+    Top = 247
+    Width = 339
     OKButton.Name = 'OKButton'
     OKButton.Hint = '[Ctrl+Enter]'
     OKButton.DefaultCaption = True
@@ -40,20 +42,21 @@ object GenericCheckListForm: TGenericCheckListForm
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 218
+    Height = 223
     Top = 13
-    Width = 331
+    Width = 339
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 6
     ItemHeight = 0
     TabOrder = 0
+    TopIndex = -1
     OnItemClick = CheckListBox1ItemClick
   end
   object InfoLabel: TLabel
     Left = 6
     Height = 1
     Top = 6
-    Width = 331
+    Width = 339
     Align = alTop
     BorderSpacing.Around = 6
     ParentColor = False
diff --git a/ide/genericchecklist.pas b/ide/genericchecklist.pas
index ca8151acd8..91f131966f 100644
--- a/ide/genericchecklist.pas
+++ b/ide/genericchecklist.pas
@@ -33,6 +33,12 @@ implementation
 
 {$R *.lfm}
 
+constructor TGenericCheckListForm.Create(TheOwner: TComponent);
+begin
+  inherited Create(TheOwner);
+  fDisallowNoneSelected := False;
+end;
+
 constructor TGenericCheckListForm.CreateWithActionButton(aCaption: TCaption;
   aResourceGlyphName: string);
 begin
@@ -89,11 +95,5 @@ begin
   end;
 end;
 
-constructor TGenericCheckListForm.Create(TheOwner: TComponent);
-begin
-  inherited Create(TheOwner);
-  fDisallowNoneSelected := False;
-end;
-
 end.
 
diff --git a/ide/genericlisteditor.lfm b/ide/genericlisteditor.lfm
index ab69e0fe42..3f3208c56f 100644
--- a/ide/genericlisteditor.lfm
+++ b/ide/genericlisteditor.lfm
@@ -8,9 +8,11 @@ object GenericListEditForm: TGenericListEditForm
   Caption = 'GenericListEditForm'
   ClientHeight = 301
   ClientWidth = 343
+  Constraints.MinHeight = 200
+  Constraints.MinWidth = 260
   KeyPreview = True
   Position = poScreenCenter
-  LCLVersion = '2.1.0.0'
+  LCLVersion = '4.99.0.0'
   OnKeyDown = FormKeyDown
   object ButtonPanel1: TButtonPanel
     Left = 6
diff --git a/ide/genericlistselect.lfm b/ide/genericlistselect.lfm
index d17fe8187a..c1ff926217 100644
--- a/ide/genericlistselect.lfm
+++ b/ide/genericlistselect.lfm
@@ -2,20 +2,20 @@ object GenericListSelectForm: TGenericListSelectForm
   Left = 389
   Height = 277
   Top = 463
-  Width = 466
+  Width = 437
   Caption = 'GenericCheckListForm'
   ClientHeight = 277
-  ClientWidth = 466
+  ClientWidth = 437
   KeyPreview = True
+  Position = poScreenCenter
+  LCLVersion = '4.99.0.0'
   OnKeyDown = FormKeyDown
   OnShow = FormShow
-  Position = poScreenCenter
-  LCLVersion = '1.9.0.0'
   object ButtonPanel1: TButtonPanel
     Left = 6
-    Height = 30
-    Top = 241
-    Width = 454
+    Height = 29
+    Top = 242
+    Width = 425
     OKButton.Name = 'OKButton'
     OKButton.Hint = '[Ctrl+Enter]'
     OKButton.DefaultCaption = True
@@ -34,9 +34,9 @@ object GenericListSelectForm: TGenericListSelectForm
   end
   object InfoLabel: TLabel
     Left = 6
-    Height = 19
+    Height = 1
     Top = 6
-    Width = 454
+    Width = 425
     Align = alTop
     BorderSpacing.Around = 6
     ParentColor = False
@@ -49,14 +49,17 @@ object GenericListSelectForm: TGenericListSelectForm
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 200
-    Top = 31
-    Width = 454
+    Height = 218
+    Top = 13
+    Width = 425
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 6
+    Constraints.MinHeight = 200
+    Constraints.MinWidth = 260
     ItemHeight = 0
+    TabOrder = 0
+    TopIndex = -1
     OnClick = ListBoxClick
     OnDblClick = ListBoxDblClick
-    TabOrder = 0
   end
 end