diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/keyAssist.js b/bundles/org.eclipse.orion.client.ui/web/orion/keyAssist.js
index <HASH>..<HASH> 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/keyAssist.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/keyAssist.js
@@ -70,16 +70,11 @@ define([
 			keyAssistContents.addEventListener(util.isFirefox ? "DOMMouseScroll" : "mousewheel", function (e) { //$NON-NLS-2$ //$NON-NLS-1$
 				this._scrollWheel(e);
 			}.bind(this));
-			document.addEventListener("keydown", function (e) { //$NON-NLS-1$
+			keyAssistDiv.addEventListener("keydown", function (e) { //$NON-NLS-1$
 				if (e.keyCode === lib.KEY.ESCAPE) {
 					this.hide();
 				}
 			}.bind(this));
-			document.addEventListener("keypress", function (e) { //$NON-NLS-1$
-				if (e.key === "Escape") {
-					this.hide();
-				}
-			}.bind(this));
 			lib.addAutoDismiss([keyAssistDiv], function () {
 				this.hide();
 			}.bind(this));
BCD & DI AVT - Some popup panels can't be closed by keyboard org-ids/web-ide-issues#<I>