diff --git a/chrome/content/zotero-platform/win/integration.css b/chrome/content/zotero-platform/win/integration.css
index bf6a5d4b8c..35caf52445 100644
--- a/chrome/content/zotero-platform/win/integration.css
+++ b/chrome/content/zotero-platform/win/integration.css
@@ -1,6 +1,5 @@
 #quick-format-dialog {
 	background: transparent;
-	-moz-appearance: -moz-win-borderless-glass;
 	padding: 0;
 }
 
@@ -24,10 +23,13 @@
 
 #quick-format-entry {
 	background: -moz-linear-gradient(-90deg, rgb(243,123,119) 0, rgb(180,47,38) 50%, rgb(156,36,27) 50%);
-	-moz-border-radius:15px;
 	padding: 10px;
 }
 
+#quick-format-entry:not([square="true"]) {
+	-moz-border-radius: 15px;
+}
+
 #zotero-icon {
 	margin: 2px 0 0 2px;
 	-moz-appearance: none;
diff --git a/chrome/content/zotero/integration/quickFormat.js b/chrome/content/zotero/integration/quickFormat.js
index 1acfe38ac8..def7546125 100644
--- a/chrome/content/zotero/integration/quickFormat.js
+++ b/chrome/content/zotero/integration/quickFormat.js
@@ -51,6 +51,10 @@ var Zotero_QuickFormat = new function () {
 		qfb.addEventListener("keypress", _onQuickSearchKeyPress, false);
 		qfe = qfiDocument.getElementById("quick-format-editor");
 		
+		if(Zotero.isWin && Zotero.Prefs.get('integration.keepAddCitationDialogRaised')) {
+			qfb.setAttribute("square", "true");
+		}
+		
 		// add labels to popup
 		var locators = Zotero.Cite.labels;
 		var menu = document.getElementById("locator-label");
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index 0dfeed95b7..fd376b534c 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -1986,10 +1986,13 @@ Zotero.Integration.Session.prototype.editCitation = function(index, noteIndex, c
 	// citeproc-js style object for use of third-party extension
 	io.style = this.style;
 	
+	
 	if(Zotero.Prefs.get("integration.useClassicAddCitationDialog")) {
-		this._displayDialog('chrome://zotero/content/integration/addCitationDialog.xul', 'resizable', io);
+		this._displayDialog('chrome://zotero/content/integration/addCitationDialog.xul', 'alwaysRaised,resizable', io);
 	} else {
-		this._displayDialog('chrome://zotero/content/integration/quickFormat.xul', '', io);
+		var mode = (!Zotero.isMac && Zotero.Prefs.get('integration.keepAddCitationDialogRaised')
+			? 'popup' : 'alwaysRaised')
+		this._displayDialog('chrome://zotero/content/integration/quickFormat.xul', mode, io);
 	}
 	
 	if(io.citation.citationItems.length) {		// we have an item