--- oup/current/Tools/Template.pas	2006/12/23 16:26:43	46
+++ oup/current/Tools/Template.pas	2006/12/26 23:37:24	58
@@ -33,6 +33,8 @@ type
     btn_sort_name_desc: TSpeedButton;
     btn_sort_ext_asc: TSpeedButton;
     btn_sort_ext_desc: TSpeedButton;
+    Label1: TLabel;
+    Label2: TLabel;
     procedure RecreateList;
     procedure LoadFileNames;
     procedure SelectFileName(filename: String);
@@ -52,6 +54,7 @@ type
     procedure popup_opentool(Sender: TObject);
     procedure filepopupPopup(Sender: TObject);
     procedure btn_sortClick(Sender: TObject);
+    procedure FormActivate(Sender: TObject);
   private
     FSortBy: TSortType;
     FOnNewFileSelected: TNewFileSelectedEvent;
@@ -275,8 +278,8 @@ var
 begin
   pt.X := x;
   pt.Y := y;
-  filelist.ItemIndex := filelist.ItemAtPos(pt, true);
-  Self.listClick(Self);
+//  filelist.ItemIndex := filelist.ItemAtPos(pt, true);
+//  Self.listClick(Self);
 end;
 
 
@@ -362,6 +365,11 @@ begin
   FAllowMultiSelect := False;
 end;
 
+procedure TForm_ToolTemplate.FormActivate(Sender: TObject);
+begin
+  edit_filtername.SetFocus;
+end;
+
 procedure TForm_ToolTemplate.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   Action := caFree;