diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index c29b6262a8..cfd4a239fb 100644
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -56,6 +56,7 @@ GuiBibtex::GuiBibtex(GuiView & lv)
 	setupUi(this);
 
 	QDialog::setModal(true);
+	setWindowModality(Qt::WindowModal);
 
 	connect(okPB, SIGNAL(clicked()),
 		this, SLOT(slotOK()));
diff --git a/src/frontends/qt4/GuiBibtex.h b/src/frontends/qt4/GuiBibtex.h
index 3ce3ada32d..496d55df92 100644
--- a/src/frontends/qt4/GuiBibtex.h
+++ b/src/frontends/qt4/GuiBibtex.h
@@ -31,6 +31,7 @@ public:
 	{
 		Ui::BibtexAddUi::setupUi(this);
 		QDialog::setModal(true);
+		setWindowModality(Qt::WindowModal);
 	}
 };
 
diff --git a/status.22x b/status.22x
index 9c1f2cc86a..58e47e055e 100644
--- a/status.22x
+++ b/status.22x
@@ -119,6 +119,9 @@ What's new
 
 - Avoid a case of stuck cursor after entering an inset (bug 10630).
 
+- Fix problems with hidden "BibTeX Add" dialogs on MacOSX by using drawers
+  instead of modal subdialogs (bug 10662).
+
 - Don't swallow labels not entered through the toolbar in mathed (bug 10546).
 
 - Fix bad context menu on insets that do not have one (bug 10616).