diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 32f1f440f9..7721316716 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -1489,7 +1489,9 @@ var ZoteroPane = new function()
 			var searchVal = search.value;
 			this.itemsView.setFilter('search', searchVal);
 			
-			document.getElementById('zotero-tb-search-cancel').hidden = searchVal == "";
+			if (Zotero.isFx30) {
+				document.getElementById('zotero-tb-search-cancel').hidden = searchVal == "";
+			}
 		}
 		
 	}
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 5c9cc539e9..6f1af86455 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -243,7 +243,10 @@
 					<label id="zotero-tb-search-label" value="&zotero.toolbar.search.label;" control="zotero-tb-search" hidden="true"/>
 					<textbox id="zotero-tb-search" type="search" timeout="250" command="cmd_zotero_search" dir="reverse"
 						onkeypress="ZoteroPane.handleSearchKeypress(this, event)"
-						oninput="ZoteroPane.handleSearchInput(this, event)">
+						oninput="ZoteroPane.handleSearchInput(this, event)"
+						testcode="me.value.indexOf('&quot;') == -1"
+						prefire="ZoteroPane.clearItemsPaneMessage()"
+						ontestfail="ZoteroPane.setItemsPaneMessage(Zotero.getString('advancedSearchMode'))">
 						<toolbarbutton id="zotero-tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
 					</textbox>
 				</hbox>