diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 38e88109eb..7e4a25f4ab 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-23  Angus Leeming  <leeming@lyx.org>
+
+	* FormExternal.C (update): the default template is the first one
+	and the choice is always active.
+
 2003-05-23  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
 	* Toolbar_pimpl.C (displayToolbar): comment out unsused parameters.
diff --git a/src/frontends/xforms/FormExternal.C b/src/frontends/xforms/FormExternal.C
index 965b883e5d..5e86b2e521 100644
--- a/src/frontends/xforms/FormExternal.C
+++ b/src/frontends/xforms/FormExternal.C
@@ -76,12 +76,9 @@ void FormExternal::update()
 	fl_set_input(dialog_->input_filename, params.filename.c_str());
 	fl_set_input(dialog_->input_parameters, params.parameters.c_str());
 
-	int const ID = controller().getTemplateNumber(params.templ.lyxName);
-	if (ID >= 0) {
-		setEnabled(dialog_->choice_template, true);
-		fl_set_choice(dialog_->choice_template, ID+1);
-	} else
-		setEnabled(dialog_->choice_template, false);
+	int ID = controller().getTemplateNumber(params.templ.lyxName);
+	if (ID < 0) ID = 0;
+	fl_set_choice(dialog_->choice_template, ID+1);
 
 	updateComboChange();
 }