diff --git a/chrome/content/zotero/advancedSearch.js b/chrome/content/zotero/advancedSearch.js
index 10a72cde62..26d5d93132 100644
--- a/chrome/content/zotero/advancedSearch.js
+++ b/chrome/content/zotero/advancedSearch.js
@@ -90,6 +90,8 @@ var ZoteroAdvancedSearch = new function() {
 		};
 
 		this.itemsView.changeCollectionTreeRow(collectionTreeRow);
+		// Focus the first field in the window
+		Services.focus.moveFocus(window, null, Services.focus.MOVEFOCUS_FORWARD, 0);
 	}
 	
 	this.onUnload = function () {
diff --git a/chrome/content/zotero/elements/zoteroSearch.js b/chrome/content/zotero/elements/zoteroSearch.js
index a76342aca7..419fc0d7d3 100644
--- a/chrome/content/zotero/elements/zoteroSearch.js
+++ b/chrome/content/zotero/elements/zoteroSearch.js
@@ -631,8 +631,6 @@
 			}
 			
 			this.onConditionSelected(menu.value);
-			
-			this.querySelector('#conditionsmenu').focus();
 		}
 
 		updateSearch() {
diff --git a/chrome/content/zotero/searchDialog.js b/chrome/content/zotero/searchDialog.js
index 08cda5f792..62cb4f1734 100644
--- a/chrome/content/zotero/searchDialog.js
+++ b/chrome/content/zotero/searchDialog.js
@@ -40,7 +40,9 @@ function doLoad()
 	var searchBox = document.getElementById('search-box');
 	searchBox.groups = io.dataIn.groups;
 	searchBox.search = io.dataIn.search;
-	document.getElementById('search-name').value = io.dataIn.name;
+	let searchName = document.getElementById('search-name');
+	searchName.value = io.dataIn.name;
+	searchName.select();
 
 	document.addEventListener('dialogaccept', doAccept);
 }
diff --git a/chrome/content/zotero/searchDialog.xhtml b/chrome/content/zotero/searchDialog.xhtml
index 2cba946f67..9a821b2d33 100644
--- a/chrome/content/zotero/searchDialog.xhtml
+++ b/chrome/content/zotero/searchDialog.xhtml
@@ -35,7 +35,7 @@
 	
 	<vbox id="zotero-search-box-container" flex="1">
 		<hbox align="center">
-			<label value="&zotero.search.name;"/>
+			<label control="search-name" value="&zotero.search.name;"/>
 			<html:input id="search-name" type="text" width="275" maxlength="80"/>
 		</hbox>
 		<zoterosearch id="search-box" flex="1"/>