diff --git a/web/viewer.js b/web/viewer.js
index 5c1eda023..b7d815392 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -508,13 +508,15 @@ var PDFFindBar = {
       self.dispatchEvent('');
     });
 
-    // TODO: Add keybindings CMD-G etc. to go to prev/
-    // next match when the findField is selected.
-
-    this.findField.addEventListener('keydown', function(evt) {
+    this.bar.addEventListener('keydown', function(evt) {
       switch (evt.keyCode) {
         case 13: // Enter
-          self.dispatchEvent('again', evt.shiftKey);
+          if (evt.target === self.findField) {
+            self.dispatchEvent('again', evt.shiftKey);
+          }
+          break;
+        case 27: // Escape
+          self.close();
           break;
       }
     });