diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 26bb9102ad..657de55406 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-16  Michael Schmitt <Michael.Schmitt@teststep.org>
+
+	* FormRef.C (update): Synchronise the buffer choice and the list of
+	labels if the dialog is re-opened.
+
 2002-08-15  Angus Leeming  <leeming@lyx.org>
 
 	* Dialogs.C:
diff --git a/src/frontends/xforms/FormRef.C b/src/frontends/xforms/FormRef.C
index f6f3f69fcc..4bcad71e57 100644
--- a/src/frontends/xforms/FormRef.C
+++ b/src/frontends/xforms/FormRef.C
@@ -113,7 +113,10 @@ void FormRef::update()
 			      controller().getBufferNum() + 1);
 	}
 
-	refs_ = controller().getLabelList(string());
+	string const name = controller().
+		getBufferName(fl_get_choice(dialog_->choice_buffer) - 1);
+	refs_ = controller().getLabelList(name);
+
 	updateBrowser(refs_);
 }