diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 221904ca6a..bf4a828649 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-05  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* QBibtexDialog.C: sanitize button behaviour (bug 2895).
+
 2007-01-05  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* QCitationDialog.C: Disallow pressing the add button in the citation 
diff --git a/src/frontends/qt2/QBibtexDialog.C b/src/frontends/qt2/QBibtexDialog.C
index cbd6061aa0..6462950a41 100644
--- a/src/frontends/qt2/QBibtexDialog.C
+++ b/src/frontends/qt2/QBibtexDialog.C
@@ -55,7 +55,7 @@ QBibtexDialog::QBibtexDialog(QBibtex * form)
 	bcview->setOK(add_->addPB);
 	bcview->setCancel(add_->closePB);
 
-	add_->bibED->setValidator(new PathValidator(false, add_->bibED));
+	add_->bibED->setValidator(new PathValidator(true, add_->bibED));
 	addCheckedLineEdit(add_bc_.view(), add_->bibED, 0);
 
 	connect(add_->bibED, SIGNAL(textChanged(const QString&)),
@@ -66,7 +66,7 @@ QBibtexDialog::QBibtexDialog(QBibtex * form)
 		this, SLOT(addDatabase()));
 	connect(add_->bibLB, SIGNAL(selected(QListBoxItem *)),
 		add_, SLOT(accept()));
-	connect(add_->bibLB, SIGNAL(currentChanged(QListBoxItem *)),
+	connect(add_->bibLB, SIGNAL(highlighted(int)),
 		this, SLOT(availableChanged()));
 	connect(add_->browsePB, SIGNAL(clicked()),
 		this, SLOT(browseBibPressed()));
@@ -142,8 +142,8 @@ void QBibtexDialog::browseBibPressed()
 
 void QBibtexDialog::addPressed()
 {
-	add_->exec();
 	add_bc_.valid(false);
+	add_->exec();
 }
 
 
@@ -178,6 +178,7 @@ void QBibtexDialog::addDatabase()
 void QBibtexDialog::deletePressed()
 {
 	databaseLB->removeItem(databaseLB->currentItem());
+	form_->changed();
 }
 
 
@@ -190,7 +191,7 @@ void QBibtexDialog::databaseChanged()
 
 void QBibtexDialog::availableChanged()
 {
-	form_->changed();
+	add_bc_.valid(true);
 }
 
 
diff --git a/status.14x b/status.14x
index de45898ec1..0bbd5fae6c 100644
--- a/status.14x
+++ b/status.14x
@@ -164,6 +164,8 @@ What's new
 
 - reset the language when dissolving an ERT inset (bug 2978)
 
+- Sanitize button enabling in the bibtex dialog [qt only] (bug 2895)
+
 * Build/installation:
 
 - Allow autoconf 2.60 and 2.61 for building.