diff --git a/chrome/content/vimperator/vimperator.js b/chrome/content/vimperator/vimperator.js
index ea4e08f6..1001bf21 100644
--- a/chrome/content/vimperator/vimperator.js
+++ b/chrome/content/vimperator/vimperator.js
@@ -917,9 +917,13 @@ function Vimperator()
 
             if (vimperator.input.pendingMap)
             {
-                vimperator.input.pendingMap.execute(null, vimperator.input.count, key);
+                if (key != "<Esc>" && key != "<C-[>")
+                    vimperator.input.pendingMap.execute(null, vimperator.input.count, key);
+
                 vimperator.input.pendingMap = null;
                 vimperator.input.buffer = "";
+                event.preventDefault();
+                event.stopPropagation();
             }
             else if (map = vimperator.mappings.get(vimperator.modes.NORMAL, candidate_command))
             {