--- oup/current/Tools/Template.pas	2006/12/25 03:04:47	54
+++ oup/releases/0.33a/Tools/Template.pas	2007/01/11 23:38:49	76
@@ -54,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;
@@ -364,6 +365,15 @@ begin
   FAllowMultiSelect := False;
 end;
 
+procedure TForm_ToolTemplate.FormActivate(Sender: TObject);
+begin
+  if edit_filtername.CanFocus then
+    edit_filtername.SetFocus
+  else
+    if content.CanFocus then
+      content.SetFocus;
+end;
+
 procedure TForm_ToolTemplate.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
   Action := caFree;