diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index b766c953d..24156703b 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -2165,10 +2165,14 @@ var ZoteroPane = new function()
 		if (!runAdvanced && search.value.indexOf('"') != -1) {
 			return;
 		}
-		this.setItemsPaneMessage(Zotero.getString('searchInProgress'));
+		var spinner = document.getElementById('zotero-tb-search-spinner');
+		spinner.style.visibility = 'visible';
 		var searchVal = search.value;
 		yield this.itemsView.setFilter('search', searchVal);
-		this.clearItemsPaneMessage();
+		spinner.style.visibility = 'hidden';
+		if (runAdvanced) {
+			this.clearItemsPaneMessage();
+		}
 	});
 	
 	
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index d9a83520c..7e6ceba47 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -197,6 +197,7 @@
 					<toolbarseparator/>
 					<toolbarbutton id="zotero-tb-advanced-search" class="zotero-tb-button" tooltiptext="&zotero.toolbar.advancedSearch;" command="cmd_zotero_advancedSearch"/>
 					<spacer flex="1"/>
+					<image id="zotero-tb-search-spinner" class="zotero-spinner" style="visibility: hidden"/>
 					<textbox id="zotero-tb-search" type="search" timeout="250"
 							onkeypress="ZoteroPane_Local.handleSearchKeypress(this, event)"
 							oninput="ZoteroPane_Local.handleSearchInput(this, event)"
diff --git a/chrome/skin/default/zotero/spinner-14px@2x.png b/chrome/skin/default/zotero/spinner-14px@2x.png
new file mode 100644
index 000000000..c072b1435
Binary files /dev/null and b/chrome/skin/default/zotero/spinner-14px@2x.png differ
diff --git a/chrome/skin/default/zotero/zotero.css b/chrome/skin/default/zotero/zotero.css
index d17494e96..ceb6647df 100644
--- a/chrome/skin/default/zotero/zotero.css
+++ b/chrome/skin/default/zotero/zotero.css
@@ -454,6 +454,13 @@ label.zotero-text-link {
 	-moz-box-pack: end;
 }
 
+.zotero-spinner {
+	list-style-image: url(chrome://zotero/skin/spinner-14px@2x.png);
+	height: 14px;
+	width: 14px;
+	margin-right: 2px;
+}
+
 /* BEGIN 2X BLOCK -- DO NOT EDIT MANUALLY -- USE 2XIZE */
 @media (min-resolution: 1.5dppx) {
 	#zotero-toolbar-save-button,#zotero-toolbar-save-button-single  { list-style-image: url("chrome://zotero/skin/treeitem-webpage@2x.png"); }