diff --git a/chrome/content/zotero/fileInterface.js b/chrome/content/zotero/fileInterface.js
index 582dfed5e5..cb4f16475f 100644
--- a/chrome/content/zotero/fileInterface.js
+++ b/chrome/content/zotero/fileInterface.js
@@ -71,6 +71,7 @@ var Zotero_File_Interface = new function() {
 					translation.translate();
 			});
 		}
+		return false;
 	}
 	
 	/*
diff --git a/chrome/content/zotero/itemPane.js b/chrome/content/zotero/itemPane.js
index e98bb4f7d1..9803338af5 100644
--- a/chrome/content/zotero/itemPane.js
+++ b/chrome/content/zotero/itemPane.js
@@ -854,12 +854,12 @@ var ZoteroItemPane = new function()
 	 * Save a multiple-field selection for the creator autocomplete
 	 * (e.g. "Shakespeare, William")
 	 */
-	function handleCreatorAutoCompleteSelect(textbox, creatorField)
+	function handleCreatorAutoCompleteSelect(textbox)
 	{
 		var comment = Zotero.Utilities.AutoComplete.getResultComment(textbox);
 		if (!comment)
 		{
-			return false;
+			return;
 		}
 		
 		var [creatorID, numFields] = comment.split('-');
diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index 1c9859a1f8..74322d88a5 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -201,7 +201,7 @@ var ZoteroPane = new function()
 		
 		if (!result)
 		{
-			return false;
+			return;
 		}
 		
 		if (!newName.value)
@@ -530,6 +530,7 @@ var ZoteroPane = new function()
 			if(collection && collection.isCollection())
 				return collection.ref;
 		}
+		return false;
 	}
 	
 	function getSelectedSavedSearch()
@@ -542,6 +543,7 @@ var ZoteroPane = new function()
 				return collection.ref;
 			}
 		}
+		return false;
 	}
 	
 	function getSelectedItems()
diff --git a/chrome/content/zotero/overlay.xul b/chrome/content/zotero/overlay.xul
index 2b2fc6d1f4..558afb17f5 100644
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@@ -129,7 +129,7 @@
 					<toolbarbutton id="tb-note-add" tooltiptext="&zotero.toolbar.note.standalone;" oncommand="ZoteroPane.newNote(event.shiftKey);"/>
 					<spacer flex="1"/>
 					<label value="&zotero.toolbar.search.label;" control="tb-search"/>
-					<textbox id="tb-search" type="timed" timeout="250" command="cmd_zotero_search" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_zotero_search'); return false; }">
+					<textbox id="tb-search" type="timed" timeout="250" command="cmd_zotero_search" dir="reverse" onkeypress="if(event.keyCode == event.DOM_VK_ESCAPE) { this.value = ''; this.doCommand('cmd_zotero_search'); return false; } return true;">
 						<toolbarbutton id="tb-search-cancel" oncommand="this.parentNode.value='';" hidden="true"/>
 					</textbox>
 				</toolbar>