diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 6414ba4a8f..134df55157 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-22  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* QRef.C (updateRefs): remove recursive call to gotoRef()
+	(fixes bug 3063); backport from revision 16754.
+
 2007-01-13  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* QGraphicsDialog.C: allow double values in the bounding
diff --git a/src/frontends/qt2/QRef.C b/src/frontends/qt2/QRef.C
index 7a53587669..1dd6d54276 100644
--- a/src/frontends/qt2/QRef.C
+++ b/src/frontends/qt2/QRef.C
@@ -215,8 +215,6 @@ void QRef::redoRefs()
 void QRef::updateRefs()
 {
 	refs_.clear();
-	if (at_ref_)
-		gotoRef();
 	string const name = controller().getBufferName(dialog_->bufferCO->currentItem());
 	refs_ = controller().getLabelList(name);
 	dialog_->sortCB->setEnabled(!refs_.empty());
diff --git a/status.14x b/status.14x
index 80505740b6..ed31a2bf2c 100644
--- a/status.14x
+++ b/status.14x
@@ -115,6 +115,9 @@ What's new
   windows). This fix was already used by the official windows installer for
   1.4.3.
 
+- Fix a crash when navigating from a label a reference in the crossrefs
+  dialog (bug 3063) [qt only].
+
 - Fix hang when deleting a forced newling character in change tracking
   mode (bug 2865).