diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index f801ec086c..3e3666b1f6 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-09  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* FormRef.C (update): Always list the labels of the current buffer.
+
 2002-09-23  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* Toolbar_pimpl.C (layoutSelected): show shortcut in minibuffer
diff --git a/src/frontends/xforms/FormRef.C b/src/frontends/xforms/FormRef.C
index 72c3d01e3c..53b36d6883 100644
--- a/src/frontends/xforms/FormRef.C
+++ b/src/frontends/xforms/FormRef.C
@@ -107,11 +107,10 @@ void FormRef::update()
 
 		fl_clear_choice(dialog_->choice_buffer);
 		fl_addto_choice(dialog_->choice_buffer, choice.c_str());
-
-		fl_set_choice(dialog_->choice_buffer,
-			      controller().getBufferNum() + 1);
 	}
 
+	fl_set_choice(dialog_->choice_buffer, controller().getBufferNum() + 1);
+
 	string const name = controller().getBufferName(fl_get_choice(dialog_->choice_buffer) - 1);
 	refs_ = controller().getLabelList(name);
 
diff --git a/status.12x b/status.12x
index a2662bbf8e..31f57c8747 100644
--- a/status.12x
+++ b/status.12x
@@ -39,6 +39,8 @@ What's new
 
 ** Bug fixes
 
+- the reference dialog now lists the labels of the current buffer.
+
 - fix bug where special characters in equations label confuse LyX
   (this was a new bug in 1.2.1)