diff --git a/chrome/content/zotero/bibliography.js b/chrome/content/zotero/bibliography.js
index 8a77b1d14..a52fb3f4d 100644
--- a/chrome/content/zotero/bibliography.js
+++ b/chrome/content/zotero/bibliography.js
@@ -110,13 +110,19 @@ var Zotero_File_Interface_Bibliography = new function() {
 			document.getElementById("fields").label = Zotero.getString("integration."+formatOption+".label");
 			document.getElementById("fields-caption").textContent = Zotero.getString("integration."+formatOption+".caption");
 			
-			// add border on Windows
 			if(Zotero.isWin) {
+				// add border on Windows
 				document.getElementById("zotero-doc-prefs-dialog").style.border = "1px solid black";
 			}
 		}
-		window.sizeToContent();
-		window.centerWindowOnScreen();
+		
+		// Center popup manually after a delay on Windows, since window
+		// isn't resizable and there might be a persisted position
+		if (Zotero.isWin) {
+			setTimeout(function () {
+				window.centerWindowOnScreen();
+			}, 1);
+		}
 	}
 	
 	/*
diff --git a/chrome/content/zotero/bindings/relatedbox.xml b/chrome/content/zotero/bindings/relatedbox.xml
index f1d91adc4..9f0ab20eb 100644
--- a/chrome/content/zotero/bindings/relatedbox.xml
+++ b/chrome/content/zotero/bindings/relatedbox.xml
@@ -138,8 +138,12 @@
 				<body>
 					<![CDATA[
 						var io = {dataIn: null, dataOut: null};
-						window.openDialog('chrome://zotero/content/selectItemsDialog.xul','','chrome,modal',io);
-
+						
+						Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
+							.getService(Components.interfaces.nsIWindowWatcher)
+							.openWindow(null, 'chrome://zotero/content/selectItemsDialog.xul', '',
+								'chrome,modal,centerscreen', io);
+						
 						if(io.dataOut && this.item)
 						{
 							for(var i = 0; i < io.dataOut.length; i++)
diff --git a/chrome/content/zotero/selectItemsDialog.js b/chrome/content/zotero/selectItemsDialog.js
index 1c0a7b91b..bff07b766 100644
--- a/chrome/content/zotero/selectItemsDialog.js
+++ b/chrome/content/zotero/selectItemsDialog.js
@@ -39,6 +39,15 @@ function doLoad()
 	
 	collectionsView = new Zotero.CollectionTreeView();
 	document.getElementById('zotero-collections-tree').view = collectionsView;
+	
+	// Center popup manually after a delay on Windows, since window
+	// isn't resizable and there might be a persisted position
+	if (Zotero.isWin &&
+			window.document.activeElement.id != 'zotero-select-items-dialog') {
+		setTimeout(function () {
+			window.centerWindowOnScreen();
+		}, 1);
+	}
 }
 
 function doUnload()
diff --git a/chrome/content/zotero/selectItemsDialog.xul b/chrome/content/zotero/selectItemsDialog.xul
index 1f6a065c4..e11b1ac13 100644
--- a/chrome/content/zotero/selectItemsDialog.xul
+++ b/chrome/content/zotero/selectItemsDialog.xul
@@ -35,7 +35,8 @@
 	onload="doLoad();"
 	onunload="doUnload();"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	style="padding:2em">
+	style="padding:2em"
+	persist="screenX screenY">
 	
 	<script src="include.js"/>
 	<script src="selectItemsDialog.js"/>
@@ -44,7 +45,8 @@
 	
 	<hbox align="center" pack="end">
 		<label value="&zotero.toolbar.search.label;" control="zotero-tb-search"/>
-		<textbox id="zotero-tb-search" type="timed" timeout="250" oncommand="onSearch()" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_zotero_search'); return false; }">
+		<textbox id="zotero-tb-search" type="timed" timeout="250" oncommand="onSearch()" dir="reverse"
+				onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { if (this.value == '') { cancelDialog(); return false; } this.value = ''; this.doCommand('cmd_zotero_search'); return false; } return true;">
 			<toolbarbutton id="zotero-tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
 		</textbox>
 	</hbox>
