diff --git a/browserAction/browserAction.js b/browserAction/browserAction.js
index 4c13ab0..4473e8d 100644
--- a/browserAction/browserAction.js
+++ b/browserAction/browserAction.js
@@ -86,13 +86,14 @@
 		actions.appendChild(search);
 		search.focus();
 		
-		search.addEventListener("keyup", function(event){
+		search.addEventListener("keypress", function(event){
 			if ([10, 13].indexOf(event.keyCode) !== -1){
 				window.open(browser.extension.getURL(
 					"options/options.html" +
 					"?search=" +
 					encodeURIComponent(this.value)
 				));
+				window.close();
 			}
 		});
 	});