diff --git a/common/content/events.js b/common/content/events.js
index 09ca6a55..f44f6fbc 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -988,10 +988,14 @@ var Events = Module("events", {
             if (!processors.some(function (p) p.main.ownsBuffer))
                 statusline.updateInputBuffer(buffer);
 
-            if (waiting)
+            if (waiting) {
+                res = Events.KILL;
                 this._processors = processors;
-            else if (res === Events.KILL && (mode.main & (modes.TEXT_EDIT | modes.VISUAL)))
+            }
+            if (res !== Events.KILL && (mode.main & (modes.TEXT_EDIT | modes.VISUAL))) {
+                res = Events.KILL;
                 dactyl.beep();
+            }
 
             if (res !== Events.PASS && !isArray(res))
                 refeed = null;