diff --git a/ideintf/fieldseditor.lfm b/ideintf/fieldseditor.lfm
index 6b66cbffe8..1f34cfbcd5 100644
--- a/ideintf/fieldseditor.lfm
+++ b/ideintf/fieldseditor.lfm
@@ -1,7 +1,7 @@
 object DSFieldsEditorFrm: TDSFieldsEditorFrm
-  Left = 132
+  Left = 44
   Height = 288
-  Top = 174
+  Top = 58
   Width = 215
   HorzScrollBar.Page = 214
   VertScrollBar.Page = 287
@@ -12,10 +12,14 @@ object DSFieldsEditorFrm: TDSFieldsEditorFrm
   OnClose = FieldsEditorFrmClose
   OnDestroy = FieldsEditorFrmDestroy
   Position = poDefaultPosOnly
+  LCLVersion = '0.9.29'
   object FieldsListBox: TListBox
+    Left = 0
     Height = 288
+    Top = 0
     Width = 215
     Align = alClient
+    ItemHeight = 0
     MultiSelect = True
     OnClick = ListBox1Click
     OnKeyDown = FieldsListBoxKeyDown
@@ -60,7 +64,6 @@ object DSFieldsEditorFrm: TDSFieldsEditorFrm
     object AddFieldsActn: TAction
       Category = 'Fields'
       Caption = '&Add fields'
-      DisableIfNoHandler = True
       Hint = 'Add fields from FieldDefs'
       OnExecute = AddFieldsActnExecute
       ShortCut = 16429
@@ -68,7 +71,6 @@ object DSFieldsEditorFrm: TDSFieldsEditorFrm
     object DeleteFieldsActn: TAction
       Category = 'Fields'
       Caption = '&Delete'
-      DisableIfNoHandler = True
       Hint = 'Delete selected field(s)'
       OnExecute = DeleteFieldsActnExecute
       ShortCut = 46
@@ -76,7 +78,6 @@ object DSFieldsEditorFrm: TDSFieldsEditorFrm
     object NewActn: TAction
       Category = 'Fields'
       Caption = '&New'
-      DisableIfNoHandler = True
       Hint = 'Create new field and add it at current position'
       OnExecute = NewActnExecute
       ShortCut = 45
@@ -84,26 +85,22 @@ object DSFieldsEditorFrm: TDSFieldsEditorFrm
     object MoveUpActn: TAction
       Category = 'Fields'
       Caption = 'Move &Up'
-      DisableIfNoHandler = True
       OnExecute = MoveUpActnExecute
     end
     object MoveDownActn: TAction
       Category = 'Fields'
       Caption = 'Move &Down'
-      DisableIfNoHandler = True
       OnExecute = MoveDownActnExecute
     end
     object SelectAllActn: TAction
       Category = 'Fields'
       Caption = '&Select all'
-      DisableIfNoHandler = True
       OnExecute = SelectAllActnExecute
       ShortCut = 16449
     end
     object UnselectAllActn: TAction
       Category = 'Fields'
       Caption = '&Unselect all'
-      DisableIfNoHandler = True
       OnExecute = UnselectAllActnExecute
     end
   end
diff --git a/ideintf/fieldseditor.lrs b/ideintf/fieldseditor.lrs
index 033497e93c..9fd06f0771 100644
--- a/ideintf/fieldseditor.lrs
+++ b/ideintf/fieldseditor.lrs
@@ -1,40 +1,38 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TDSFieldsEditorFrm','FORMDATA',[
-  'TPF0'#18'TDSFieldsEditorFrm'#17'DSFieldsEditorFrm'#4'Left'#3#132#0#6'Height'
-  +#3' '#1#3'Top'#3#174#0#5'Width'#3#215#0#18'HorzScrollBar.Page'#3#214#0#18'Ve'
-  +'rtScrollBar.Page'#3#31#1#13'ActiveControl'#7#13'FieldsListBox'#7'Caption'#6
-  +#13'Fields Editor'#12'ClientHeight'#3' '#1#11'ClientWidth'#3#215#0#7'OnClose'
-  +#7#20'FieldsEditorFrmClose'#9'OnDestroy'#7#22'FieldsEditorFrmDestroy'#8'Posi'
-  +'tion'#7#16'poDefaultPosOnly'#0#8'TListBox'#13'FieldsListBox'#6'Height'#3' '
-  +#1#5'Width'#3#215#0#5'Align'#7#8'alClient'#11'MultiSelect'#9#7'OnClick'#7#13
-  +'ListBox1Click'#9'OnKeyDown'#7#20'FieldsListBoxKeyDown'#9'PopupMenu'#7#10'Po'
-  +'pupMenu1'#8'TabOrder'#2#0#0#0#10'TPopupMenu'#10'PopupMenu1'#4'left'#2#8#3't'
-  +'op'#3#144#0#0#9'TMenuItem'#9'MenuItem1'#6'Action'#7#13'AddFieldsActn'#7'OnC'
-  +'lick'#7#20'AddFieldsActnExecute'#0#0#9'TMenuItem'#9'MenuItem2'#6'Action'#7
-  +#16'DeleteFieldsActn'#7'OnClick'#7#23'DeleteFieldsActnExecute'#0#0#9'TMenuIt'
-  +'em'#9'MenuItem5'#6'Action'#7#7'NewActn'#7'OnClick'#7#14'NewActnExecute'#0#0
-  +#9'TMenuItem'#9'MenuItem3'#6'Action'#7#10'MoveUpActn'#7'OnClick'#7#17'MoveUp'
-  +'ActnExecute'#0#0#9'TMenuItem'#9'MenuItem4'#6'Action'#7#12'MoveDownActn'#7'O'
-  +'nClick'#7#19'MoveDownActnExecute'#0#0#9'TMenuItem'#9'MenuItem6'#6'Action'#7
-  +#13'SelectAllActn'#7'OnClick'#7#20'SelectAllActnExecute'#0#0#9'TMenuItem'#9
-  +'MenuItem7'#6'Action'#7#15'UnselectAllActn'#7'OnClick'#7#22'UnselectAllActnE'
-  +'xecute'#0#0#0#11'TActionList'#11'ActionList1'#4'left'#2'('#3'top'#3#144#0#0
-  +#7'TAction'#13'AddFieldsActn'#8'Category'#6#6'Fields'#7'Caption'#6#11'&Add f'
-  +'ields'#18'DisableIfNoHandler'#9#4'Hint'#6#25'Add fields from FieldDefs'#9'O'
-  +'nExecute'#7#20'AddFieldsActnExecute'#8'ShortCut'#3'-@'#0#0#7'TAction'#16'De'
-  +'leteFieldsActn'#8'Category'#6#6'Fields'#7'Caption'#6#7'&Delete'#18'DisableI'
-  +'fNoHandler'#9#4'Hint'#6#24'Delete selected field(s)'#9'OnExecute'#7#23'Dele'
-  +'teFieldsActnExecute'#8'ShortCut'#2'.'#0#0#7'TAction'#7'NewActn'#8'Category'
-  +#6#6'Fields'#7'Caption'#6#4'&New'#18'DisableIfNoHandler'#9#4'Hint'#6'/Create'
-  +' new field and add it at current position'#9'OnExecute'#7#14'NewActnExecute'
-  +#8'ShortCut'#2'-'#0#0#7'TAction'#10'MoveUpActn'#8'Category'#6#6'Fields'#7'Ca'
-  +'ption'#6#8'Move &Up'#18'DisableIfNoHandler'#9#9'OnExecute'#7#17'MoveUpActnE'
-  +'xecute'#0#0#7'TAction'#12'MoveDownActn'#8'Category'#6#6'Fields'#7'Caption'#6
-  +#10'Move &Down'#18'DisableIfNoHandler'#9#9'OnExecute'#7#19'MoveDownActnExecu'
-  +'te'#0#0#7'TAction'#13'SelectAllActn'#8'Category'#6#6'Fields'#7'Caption'#6#11
-  +'&Select all'#18'DisableIfNoHandler'#9#9'OnExecute'#7#20'SelectAllActnExecut'
-  +'e'#8'ShortCut'#3'A@'#0#0#7'TAction'#15'UnselectAllActn'#8'Category'#6#6'Fie'
-  +'lds'#7'Caption'#6#13'&Unselect all'#18'DisableIfNoHandler'#9#9'OnExecute'#7
-  +#22'UnselectAllActnExecute'#0#0#0#0
+  'TPF0'#18'TDSFieldsEditorFrm'#17'DSFieldsEditorFrm'#4'Left'#2','#6'Height'#3
+  +' '#1#3'Top'#2':'#5'Width'#3#215#0#18'HorzScrollBar.Page'#3#214#0#18'VertScr'
+  +'ollBar.Page'#3#31#1#13'ActiveControl'#7#13'FieldsListBox'#7'Caption'#6#13'F'
+  +'ields Editor'#12'ClientHeight'#3' '#1#11'ClientWidth'#3#215#0#7'OnClose'#7
+  +#20'FieldsEditorFrmClose'#9'OnDestroy'#7#22'FieldsEditorFrmDestroy'#8'Positi'
+  +'on'#7#16'poDefaultPosOnly'#10'LCLVersion'#6#6'0.9.29'#0#8'TListBox'#13'Fiel'
+  +'dsListBox'#4'Left'#2#0#6'Height'#3' '#1#3'Top'#2#0#5'Width'#3#215#0#5'Align'
+  +#7#8'alClient'#10'ItemHeight'#2#0#11'MultiSelect'#9#7'OnClick'#7#13'ListBox1'
+  +'Click'#9'OnKeyDown'#7#20'FieldsListBoxKeyDown'#9'PopupMenu'#7#10'PopupMenu1'
+  +#8'TabOrder'#2#0#0#0#10'TPopupMenu'#10'PopupMenu1'#4'left'#2#8#3'top'#3#144#0
+  +#0#9'TMenuItem'#9'MenuItem1'#6'Action'#7#13'AddFieldsActn'#7'OnClick'#7#20'A'
+  +'ddFieldsActnExecute'#0#0#9'TMenuItem'#9'MenuItem2'#6'Action'#7#16'DeleteFie'
+  +'ldsActn'#7'OnClick'#7#23'DeleteFieldsActnExecute'#0#0#9'TMenuItem'#9'MenuIt'
+  +'em5'#6'Action'#7#7'NewActn'#7'OnClick'#7#14'NewActnExecute'#0#0#9'TMenuItem'
+  +#9'MenuItem3'#6'Action'#7#10'MoveUpActn'#7'OnClick'#7#17'MoveUpActnExecute'#0
+  +#0#9'TMenuItem'#9'MenuItem4'#6'Action'#7#12'MoveDownActn'#7'OnClick'#7#19'Mo'
+  +'veDownActnExecute'#0#0#9'TMenuItem'#9'MenuItem6'#6'Action'#7#13'SelectAllAc'
+  +'tn'#7'OnClick'#7#20'SelectAllActnExecute'#0#0#9'TMenuItem'#9'MenuItem7'#6'A'
+  +'ction'#7#15'UnselectAllActn'#7'OnClick'#7#22'UnselectAllActnExecute'#0#0#0
+  +#11'TActionList'#11'ActionList1'#4'left'#2'('#3'top'#3#144#0#0#7'TAction'#13
+  +'AddFieldsActn'#8'Category'#6#6'Fields'#7'Caption'#6#11'&Add fields'#4'Hint'
+  +#6#25'Add fields from FieldDefs'#9'OnExecute'#7#20'AddFieldsActnExecute'#8'S'
+  +'hortCut'#3'-@'#0#0#7'TAction'#16'DeleteFieldsActn'#8'Category'#6#6'Fields'#7
+  +'Caption'#6#7'&Delete'#4'Hint'#6#24'Delete selected field(s)'#9'OnExecute'#7
+  +#23'DeleteFieldsActnExecute'#8'ShortCut'#2'.'#0#0#7'TAction'#7'NewActn'#8'Ca'
+  +'tegory'#6#6'Fields'#7'Caption'#6#4'&New'#4'Hint'#6'/Create new field and ad'
+  +'d it at current position'#9'OnExecute'#7#14'NewActnExecute'#8'ShortCut'#2'-'
+  +#0#0#7'TAction'#10'MoveUpActn'#8'Category'#6#6'Fields'#7'Caption'#6#8'Move &'
+  +'Up'#9'OnExecute'#7#17'MoveUpActnExecute'#0#0#7'TAction'#12'MoveDownActn'#8
+  +'Category'#6#6'Fields'#7'Caption'#6#10'Move &Down'#9'OnExecute'#7#19'MoveDow'
+  +'nActnExecute'#0#0#7'TAction'#13'SelectAllActn'#8'Category'#6#6'Fields'#7'Ca'
+  +'ption'#6#11'&Select all'#9'OnExecute'#7#20'SelectAllActnExecute'#8'ShortCut'
+  +#3'A@'#0#0#7'TAction'#15'UnselectAllActn'#8'Category'#6#6'Fields'#7'Caption'
+  +#6#13'&Unselect all'#9'OnExecute'#7#22'UnselectAllActnExecute'#0#0#0#0
 ]);
diff --git a/ideintf/fieldseditor.pas b/ideintf/fieldseditor.pas
index b471b8bfea..72580feeb7 100644
--- a/ideintf/fieldseditor.pas
+++ b/ideintf/fieldseditor.pas
@@ -165,11 +165,11 @@ begin
       fld.Free;
       bModified := True;
     end;
+  SelectionChanged;
   if bModified then
     fDesigner.Modified;
   if PreActive then
     LinkDataSet.Active := True;
-  SelectionChanged;
 end;
 
 procedure TDSFieldsEditorFrm.FieldsEditorFrmClose(Sender: TObject;