diff --git a/ide/useprojunitdlg.lfm b/ide/useprojunitdlg.lfm
index ae57c8be5d..fc6f85ea83 100644
--- a/ide/useprojunitdlg.lfm
+++ b/ide/useprojunitdlg.lfm
@@ -28,7 +28,7 @@ object UseUnitDialog: TUseUnitDialog
     CloseButton.Enabled = False
     CancelButton.Name = 'CancelButton'
     CancelButton.Caption = 'Cancel'
-    TabOrder = 2
+    TabOrder = 4
     ShowButtons = [pbOK, pbCancel]
     ShowBevel = False
   end
@@ -64,7 +64,7 @@ object UseUnitDialog: TUseUnitDialog
       'Interface'
       'Implementation'
     )
-    TabOrder = 1
+    TabOrder = 3
   end
   object UnitsListBox: TListBox
     AnchorSideLeft.Control = Owner
@@ -81,7 +81,7 @@ object UseUnitDialog: TUseUnitDialog
     ItemHeight = 0
     OnDblClick = UnitsListBoxDblClick
     Style = lbOwnerDrawFixed
-    TabOrder = 0
+    TabOrder = 1
   end
   object AllUnitsCheckBox: TCheckBox
     AnchorSideLeft.Control = Owner
@@ -95,7 +95,7 @@ object UseUnitDialog: TUseUnitDialog
     BorderSpacing.Around = 6
     Caption = 'Show all units'
     OnChange = AllUnitsCheckBoxChange
-    TabOrder = 3
+    TabOrder = 2
   end
   object FilterEdit: TListFilterEdit
     AnchorSideLeft.Control = Owner
@@ -112,6 +112,6 @@ object UseUnitDialog: TUseUnitDialog
     Font.Color = clBtnShadow
     MaxLength = 0
     ParentFont = False
-    TabOrder = 4
+    TabOrder = 0
   end
 end
diff --git a/packager/installpkgsetdlg.lfm b/packager/installpkgsetdlg.lfm
index 44ab18fc86..da21c2d216 100644
--- a/packager/installpkgsetdlg.lfm
+++ b/packager/installpkgsetdlg.lfm
@@ -42,7 +42,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       BorderSpacing.Around = 6
       Caption = 'ImportButton'
       OnClick = ImportButtonClick
-      TabOrder = 0
+      TabOrder = 2
     end
     object ExportButton: TButton
       Left = 6
@@ -53,7 +53,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       BorderSpacing.Around = 6
       Caption = 'ExportButton'
       OnClick = ExportButtonClick
-      TabOrder = 1
+      TabOrder = 3
     end
     object InstallTreeView: TTreeView
       Left = 6
@@ -68,7 +68,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       ShowButtons = False
       ShowLines = False
       ShowRoot = False
-      TabOrder = 2
+      TabOrder = 0
       OnDblClick = InstallTreeViewDblClick
       OnSelectionChanged = InstallTreeViewSelectionChanged
       Options = [tvoAllowMultiselect, tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoToolTips, tvoThemedDraw]
@@ -82,7 +82,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       BorderSpacing.Around = 6
       Caption = 'UninstallButton'
       OnClick = UninstallButtonClick
-      TabOrder = 3
+      TabOrder = 1
     end
   end
   object AvailablePkgGroupBox: TGroupBox
@@ -120,7 +120,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       ShowButtons = False
       ShowLines = False
       ShowRoot = False
-      TabOrder = 0
+      TabOrder = 1
       OnDblClick = AvailableTreeViewDblClick
       OnSelectionChanged = AvailableTreeViewSelectionChanged
       Options = [tvoAllowMultiselect, tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoToolTips, tvoThemedDraw]
@@ -134,7 +134,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       BorderSpacing.Around = 6
       Caption = 'AddToInstallButton'
       OnClick = AddToInstallButtonClick
-      TabOrder = 1
+      TabOrder = 2
     end
     object AvailableFilterEdit: TListFilterEdit
       Left = 6
@@ -148,7 +148,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       Font.Color = clBtnShadow
       MaxLength = 0
       ParentFont = False
-      TabOrder = 2
+      TabOrder = 0
     end
   end
   object PkgInfoGroupBox: TGroupBox
diff --git a/packager/installpkgsetdlg.pas b/packager/installpkgsetdlg.pas
index 3f6d36175b..6dec0aea1e 100644
--- a/packager/installpkgsetdlg.pas
+++ b/packager/installpkgsetdlg.pas
@@ -192,7 +192,7 @@ begin
 
   fAvailablePackages:=TAVLTree.Create(@CompareLazPackageIDNames);
   FNewInstalledPackages:=TObjectList.Create(true);
-
+  ActiveControl:=AvailableFilterEdit;
   PkgInfoMemo.Clear;
 end;
 
diff --git a/packager/packageeditor.lfm b/packager/packageeditor.lfm
index 0b8caa4b54..7f52aaf72d 100644
--- a/packager/packageeditor.lfm
+++ b/packager/packageeditor.lfm
@@ -31,7 +31,7 @@ inherited PackageEditorForm: TPackageEditorForm
     Caption = 'FilePropsGroupBox'
     ClientHeight = 101
     ClientWidth = 573
-    TabOrder = 1
+    TabOrder = 2
     object CallRegisterProcCheckBox: TCheckBox
       Left = 0
       Height = 18
@@ -175,7 +175,7 @@ inherited PackageEditorForm: TPackageEditorForm
     BevelOuter = bvNone
     ClientHeight = 261
     ClientWidth = 577
-    TabOrder = 4
+    TabOrder = 1
     object FilesTreeView: TTreeView
       AnchorSideTop.Side = asrBottom
       Left = 0
@@ -187,7 +187,7 @@ inherited PackageEditorForm: TPackageEditorForm
       DefaultItemHeight = 15
       PopupMenu = FilesPopupMenu
       ReadOnly = True
-      TabOrder = 0
+      TabOrder = 1
       OnDblClick = FilesTreeViewDblClick
       OnKeyPress = FilesTreeViewKeyPress
       OnSelectionChanged = FilesTreeViewSelectionChanged
@@ -240,7 +240,7 @@ inherited PackageEditorForm: TPackageEditorForm
       Font.Color = clBtnShadow
       MaxLength = 0
       ParentFont = False
-      TabOrder = 1
+      TabOrder = 0
     end
   end
   object FilesPopupMenu: TPopupMenu[5]