diff --git a/common/content/dactyl.xul b/common/content/dactyl.xul
index b8054aef..956c986d 100644
--- a/common/content/dactyl.xul
+++ b/common/content/dactyl.xul
@@ -26,11 +26,6 @@
     <script type="application/x-javascript;version=1.8" src="&dactyl.content;dactyl-overlay.js"/>
 
     <window id="&dactyl.mainWindow;">
-        <keyset id="mainKeyset">
-            <!-- Why do we need this? ––Kris -->
-            <key id="key_stop" keycode="VK_ESCAPE" oncommand="&events;.onEscape();"/>
-            <!-- other keys are handled inside the event loop in events.js -->
-        </keyset>
 
         <popupset>
             <panel id="dactyl-visualbell" dactyl:highlight="Bell"
diff --git a/common/content/events.js b/common/content/events.js
index 4d389e98..94c7a312 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -934,6 +934,10 @@ const Events = Module("events", {
             let motionMap = (this._input.pendingMotionMap && this._input.pendingMotionMap.names[0]) || "";
             if (!(modes.extended & modes.HINTS))
                 statusline.updateInputBuffer(motionMap + this._input.buffer);
+
+            // This is a stupid, silly, and revolting hack.
+            if (isEscape(key))
+                this.onEscape();
         }
     },
 
@@ -1034,10 +1038,6 @@ const Events = Module("events", {
         };
     },
     mappings: function () {
-        mappings.add(modes.all,
-            ["<Esc>", "<C-[>"], "Focus content",
-            function () { events.onEscape(); });
-
         // add the ":" mapping in all but insert mode mappings
         mappings.add(modes.matchModes({ extended: false, input: false }),
             [":"], "Enter command line mode",