diff --git a/chrome/content/zotero/xpcom/search.js b/chrome/content/zotero/xpcom/search.js
index 6f17ed71e..4f296cb46 100644
--- a/chrome/content/zotero/xpcom/search.js
+++ b/chrome/content/zotero/xpcom/search.js
@@ -203,6 +203,7 @@ Zotero.Search.prototype.addCondition = function(condition, operator, value, requ
 			this.addCondition('creator', operator, part.text, false);
 			this.addCondition('tag', operator, part.text, false);
 			this.addCondition('note', operator, part.text, false);
+			this.addCondition('annotation', operator, part.text, false);
 			
 			if (part.inQuotes) {
 				this.addCondition('fulltextContent', operator, part.text, false);
@@ -1540,6 +1541,16 @@ Zotero.SearchConditions = new function(){
 				template: true // mark for special handling
 			},
 			
+			{
+				name: 'annotation',
+				operators: {
+					contains: true,
+					doesNotContain: true
+				},
+				table: 'annotations',
+				field: 'text'
+			},
+			
 			{
 				name: 'fulltextWord',
 				operators: {
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 364116518..57093506d 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -409,6 +409,7 @@ searchConditions.dateModified	= Date Modified
 searchConditions.fulltextContent = Attachment Content
 searchConditions.programmingLanguage	= Programming Language
 searchConditions.fileTypeID		= Attachment File Type
+searchConditions.annotation		= Annotation
 
 fulltext.indexState.indexed								= Indexed
 fulltext.indexState.unavailable							= Unknown