diff --git a/designer/taborderdlg.lfm b/designer/taborderdlg.lfm
index 94afac18b6..8edd393a00 100644
--- a/designer/taborderdlg.lfm
+++ b/designer/taborderdlg.lfm
@@ -10,7 +10,6 @@ object TabOrderDialog: TTabOrderDialog
   ClientWidth = 310
   OnClose = TabOrderDialogCLOSE
   OnCreate = TabOrderDialogCREATE
-  ParentFont = False
   Position = poScreenCenter
   LCLVersion = '0.9.27'
   object ArrowUp: TSpeedButton
@@ -44,11 +43,12 @@ object TabOrderDialog: TTabOrderDialog
     AnchorSideTop.Control = Owner
     AnchorSideBottom.Control = ShowOldValuesCheckbox
     Left = 6
-    Height = 318
+    Height = 320
     Top = 6
     Width = 267
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 6
+    Ctl3D = False
     DefaultItemHeight = 15
     HideSelection = False
     ParentCtl3D = False
@@ -60,9 +60,9 @@ object TabOrderDialog: TTabOrderDialog
     AnchorSideLeft.Control = Owner
     AnchorSideBottom.Control = CancelButton
     Left = 6
-    Height = 19
-    Top = 330
-    Width = 146
+    Height = 17
+    Top = 332
+    Width = 141
     Anchors = [akLeft, akBottom]
     BorderSpacing.Around = 6
     Caption = 'ShowOldValuesCheckbox'
diff --git a/designer/taborderdlg.lrs b/designer/taborderdlg.lrs
index a03063bc4a..f726719fa3 100644
--- a/designer/taborderdlg.lrs
+++ b/designer/taborderdlg.lrs
@@ -5,38 +5,38 @@ LazarusResources.Add('TTabOrderDialog','FORMDATA',[
   +#3'Top'#3#167#0#5'Width'#3'6'#1#13'ActiveControl'#7#12'ItemTreeview'#11'Bord'
   +'erStyle'#7#13'bsSizeToolWin'#7'Caption'#6#14'TabOrderDialog'#12'ClientHeigh'
   +'t'#3#131#1#11'ClientWidth'#3'6'#1#7'OnClose'#7#19'TabOrderDialogCLOSE'#8'On'
-  +'Create'#7#20'TabOrderDialogCREATE'#10'ParentFont'#8#8'Position'#7#14'poScre'
-  +'enCenter'#10'LCLVersion'#6#6'0.9.27'#0#12'TSpeedButton'#7'ArrowUp'#23'Ancho'
-  +'rSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Le'
-  +'ft'#3#23#1#6'Height'#2#25#3'Top'#2'x'#5'Width'#2#25#7'Anchors'#11#5'akTop'#7
-  +'akRight'#0#20'BorderSpacing.Around'#2#6#5'Color'#7#9'clBtnFace'#9'NumGlyphs'
-  +#2#0#7'OnClick'#7#18'UpSpeedbuttonCLICK'#0#0#12'TSpeedButton'#9'ArrowDown'#23
-  +'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'
-  +#4'Left'#3#23#1#6'Height'#2#25#3'Top'#3#176#0#5'Width'#2#25#7'Anchors'#11#5
-  +'akTop'#7'akRight'#0#20'BorderSpacing.Around'#2#6#5'Color'#7#9'clBtnFace'#9
-  +'NumGlyphs'#2#0#7'OnClick'#7#20'DownSpeedbuttonCLICK'#0#0#9'TTreeView'#12'It'
-  +'emTreeview'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
-  +#7#5'Owner'#24'AnchorSideBottom.Control'#7#21'ShowOldValuesCheckbox'#4'Left'
-  +#2#6#6'Height'#3'>'#1#3'Top'#2#6#5'Width'#3#11#1#7'Anchors'#11#5'akTop'#6'ak'
-  +'Left'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#17'DefaultItemH'
-  +'eight'#2#15#13'HideSelection'#8#11'ParentCtl3D'#8#16'RightClickSelect'#9#8
-  +'TabOrder'#2#0#7'Options'#11#17'tvoAutoItemHeight'#21'tvoKeepCollapsedNodes'
-  +#19'tvoRightClickSelect'#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'
-  +#11'tvoToolTips'#0#0#0#9'TCheckBox'#21'ShowOldValuesCheckbox'#22'AnchorSideL'
-  +'eft.Control'#7#5'Owner'#24'AnchorSideBottom.Control'#7#12'CancelButton'#4'L'
-  +'eft'#2#6#6'Height'#2#19#3'Top'#3'J'#1#5'Width'#3#146#0#7'Anchors'#11#6'akLe'
-  +'ft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'ShowOldValue'
-  +'sCheckbox'#7'OnClick'#7#26'ShowOldValuesCheckboxCLICK'#8'TabOrder'#2#1#0#0#7
-  +'TBitBtn'#8'OkButton'#23'AnchorSideRight.Control'#7#12'CancelButton'#24'Anch'
-  +'orSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
-  +'Left'#3#162#0#6'Height'#2#26#3'Top'#3'c'#1#5'Width'#2';'#7'Anchors'#11#7'ak'
-  +'Right'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6
-  +#3'&OK'#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7
-  +#13'OkButtonCLICK'#8'TabOrder'#2#2#0#0#7'TBitBtn'#12'CancelButton'#23'Anchor'
-  +'SideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'An'
-  +'chorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'
-  +#4'Left'#3#227#0#6'Height'#2#26#3'Top'#3'c'#1#5'Width'#2'M'#7'Anchors'#11#7
-  +'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'
-  +#9#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGly'
-  +'phs'#2#0#8'TabOrder'#2#3#0#0#0
+  +'Create'#7#20'TabOrderDialogCREATE'#8'Position'#7#14'poScreenCenter'#10'LCLV'
+  +'ersion'#6#6'0.9.27'#0#12'TSpeedButton'#7'ArrowUp'#23'AnchorSideRight.Contro'
+  +'l'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#23#1#6'Heig'
+  +'ht'#2#25#3'Top'#2'x'#5'Width'#2#25#7'Anchors'#11#5'akTop'#7'akRight'#0#20'B'
+  +'orderSpacing.Around'#2#6#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'
+  +#7#18'UpSpeedbuttonCLICK'#0#0#12'TSpeedButton'#9'ArrowDown'#23'AnchorSideRig'
+  +'ht.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#23
+  +#1#6'Height'#2#25#3'Top'#3#176#0#5'Width'#2#25#7'Anchors'#11#5'akTop'#7'akRi'
+  +'ght'#0#20'BorderSpacing.Around'#2#6#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0
+  +#7'OnClick'#7#20'DownSpeedbuttonCLICK'#0#0#9'TTreeView'#12'ItemTreeview'#22
+  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#24
+  +'AnchorSideBottom.Control'#7#21'ShowOldValuesCheckbox'#4'Left'#2#6#6'Height'
+  +#3'@'#1#3'Top'#2#6#5'Width'#3#11#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
+  +'t'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#5'Ctl3D'#8#17'DefaultItemHeig'
+  +'ht'#2#15#13'HideSelection'#8#11'ParentCtl3D'#8#16'RightClickSelect'#9#8'Tab'
+  +'Order'#2#0#7'Options'#11#17'tvoAutoItemHeight'#21'tvoKeepCollapsedNodes'#19
+  +'tvoRightClickSelect'#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'#11
+  +'tvoToolTips'#0#0#0#9'TCheckBox'#21'ShowOldValuesCheckbox'#22'AnchorSideLeft'
+  +'.Control'#7#5'Owner'#24'AnchorSideBottom.Control'#7#12'CancelButton'#4'Left'
+  +#2#6#6'Height'#2#17#3'Top'#3'L'#1#5'Width'#3#141#0#7'Anchors'#11#6'akLeft'#8
+  +'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'ShowOldValuesCheck'
+  +'box'#7'OnClick'#7#26'ShowOldValuesCheckboxCLICK'#8'TabOrder'#2#1#0#0#7'TBit'
+  +'Btn'#8'OkButton'#23'AnchorSideRight.Control'#7#12'CancelButton'#24'AnchorSi'
+  +'deBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Lef'
+  +'t'#3#162#0#6'Height'#2#26#3'Top'#3'c'#1#5'Width'#2';'#7'Anchors'#11#7'akRig'
+  +'ht'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#3
+  +'&OK'#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#13
+  +'OkButtonCLICK'#8'TabOrder'#2#2#0#0#7'TBitBtn'#12'CancelButton'#23'AnchorSid'
+  +'eRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'Ancho'
+  +'rSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
+  +'Left'#3#227#0#6'Height'#2#26#3'Top'#3'c'#1#5'Width'#2'M'#7'Anchors'#11#7'ak'
+  +'Right'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9
+  +#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyph'
+  +'s'#2#0#8'TabOrder'#2#3#0#0#0
 ]);
diff --git a/designer/taborderdlg.pas b/designer/taborderdlg.pas
index c66c22d2c8..e1c8355d6d 100644
--- a/designer/taborderdlg.pas
+++ b/designer/taborderdlg.pas
@@ -161,19 +161,18 @@ var
   AControl: TWinControl;
   CurTabOrder: Integer;
 begin
-  CurTabOrder:=0;
-  while ANode<>nil do begin
-    AControl:=TWinControl(ANode.Data);
-    if AControl.TabStop then begin
-      if AControl.TabOrder<>CurTabOrder then
-        TabChanged:=true;
-      AControl.TabOrder:=TTabOrder(CurTabOrder);
-      DebugLn('TTabOrderDialog.CommitNodes A ',AControl.Name,' ',
-        IntToStr(AControl.TabOrder),' ',IntToStr(CurTabOrder));
-      inc(CurTabOrder);
-    end;
-    CommitNodes(ANode.GetFirstChild,TabChanged);
-    ANode:=ANode.GetNextSibling;
+  CurTabOrder := 0;
+  while ANode <> nil do
+  begin
+    AControl := TWinControl(ANode.Data);
+    if AControl.TabOrder <> CurTabOrder then
+      TabChanged := True;
+    AControl.TabOrder := TTabOrder(CurTabOrder);
+    //DebugLn('TTabOrderDialog.CommitNodes A ',AControl.Name,' ',
+    //  IntToStr(AControl.TabOrder),' ',IntToStr(CurTabOrder));
+    inc(CurTabOrder);
+    CommitNodes(ANode.GetFirstChild, TabChanged);
+    ANode := ANode.GetNextSibling;
   end;
 end;