diff --git a/chrome/content/zotero/xpcom/search.js b/chrome/content/zotero/xpcom/search.js
index 32960abfb..a88faa952 100644
--- a/chrome/content/zotero/xpcom/search.js
+++ b/chrome/content/zotero/xpcom/search.js
@@ -408,12 +408,12 @@ Zotero.Search.prototype.addCondition = function(condition, operator, value, requ
 			}
 			else {
 				this.addCondition('field', operator, part.text, false);
+				this.addCondition('tag', operator, part.text, false);
+				this.addCondition('note', operator, part.text, false);
 			}
 			this.addCondition('creator', operator, part.text, false);
 			
 			if (condition == 'quicksearch-everything') {
-				this.addCondition('tag', operator, part.text, false);
-				this.addCondition('note', operator, part.text, false);
 				this.addCondition('annotation', operator, part.text, false);
 				
 				if (part.inQuotes) {
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 6624a7542..d23429511 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -3634,7 +3634,7 @@ var ZoteroPane = new function()
 		};
 		
 		if (!modes[mode]) {
-			mode = 'everything';
+			mode = 'fields';
 		}
 		
 		var searchBox = document.getElementById('zotero-tb-search');