diff --git a/packager/installpkgsetdlg.lfm b/packager/installpkgsetdlg.lfm
index fade80b6bf..6207688889 100644
--- a/packager/installpkgsetdlg.lfm
+++ b/packager/installpkgsetdlg.lfm
@@ -122,6 +122,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       ShowRoot = False
       TabOrder = 1
       OnDblClick = AvailableTreeViewDblClick
+      OnKeyPress = AvailableTreeViewKeyPress
       OnSelectionChanged = AvailableTreeViewSelectionChanged
       Options = [tvoAllowMultiselect, tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoToolTips, tvoThemedDraw]
     end
@@ -141,7 +142,6 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       Height = 20
       Top = 7
       Width = 247
-      FilteredTreeview = AvailableTreeView
       ButtonWidth = 23
       NumGlyphs = 0
       Anchors = [akTop, akLeft, akRight]
@@ -149,6 +149,7 @@ object InstallPkgSetDialog: TInstallPkgSetDialog
       MaxLength = 0
       ParentFont = False
       TabOrder = 0
+      FilteredTreeview = AvailableTreeView
     end
   end
   object PkgInfoGroupBox: TGroupBox
diff --git a/packager/installpkgsetdlg.pas b/packager/installpkgsetdlg.pas
index beb7c0851e..eda709b968 100644
--- a/packager/installpkgsetdlg.pas
+++ b/packager/installpkgsetdlg.pas
@@ -40,9 +40,10 @@ interface
 uses
   Classes, SysUtils, contnrs, LCLProc, Forms, Controls, Graphics, Dialogs,
   KeywordFuncLists, StdCtrls, Buttons, FileUtil, ExtCtrls, ComCtrls, EditBtn,
-  AVL_Tree, Laz_XMLCfg, TreeFilterEdit, PackageIntf, IDEImagesIntf, IDEHelpIntf,
-  IDEDialogs, LazarusIDEStrConsts, EnvironmentOpts, InputHistory, LazConf,
-  IDEProcs, PackageDefs, PackageSystem, PackageLinks, IDEContextHelpEdit;
+  LCLType, AVL_Tree, Laz_XMLCfg, TreeFilterEdit, PackageIntf, IDEImagesIntf,
+  IDEHelpIntf, IDEDialogs, LazarusIDEStrConsts, EnvironmentOpts, InputHistory,
+  LazConf, IDEProcs, PackageDefs, PackageSystem, PackageLinks,
+  IDEContextHelpEdit;
 
 type
   TOnCheckInstallPackageList =
@@ -71,6 +72,7 @@ type
     UninstallButton: TBitBtn;
     procedure AddToInstallButtonClick(Sender: TObject);
     procedure AvailableTreeViewDblClick(Sender: TObject);
+    procedure AvailableTreeViewKeyPress(Sender: TObject; var Key: char);
     procedure AvailableTreeViewSelectionChanged(Sender: TObject);
     procedure ExportButtonClick(Sender: TObject);
     procedure HelpButtonClick(Sender: TObject);
@@ -272,6 +274,12 @@ begin
   AddToInstall;
 end;
 
+procedure TInstallPkgSetDialog.AvailableTreeViewKeyPress(Sender: TObject; var Key: char);
+begin
+  if Key = char(VK_RETURN) then
+    AddToInstall;
+end;
+
 procedure TInstallPkgSetDialog.InstallPkgSetDialogDestroy(Sender: TObject);
 begin
   ClearNewInstalledPackages;