3 files changed, 10 insertions, 2 deletions
diff --git a/content_scripts/link_hints.coffee b/content_scripts/link_hints.coffee
index e5c8b57b..4d9bbd1f 100644
--- a/content_scripts/link_hints.coffee
+++ b/content_scripts/link_hints.coffee
@@ -292,8 +292,11 @@ class LinkHintsMode
       if keyChar = KeyboardUtils.getKeyChar event
         @markerMatcher.pushKeyChar keyChar
         @updateVisibleMarkers()
+        DomUtils.consumeKeyup event
+        return
 
-    DomUtils.consumeKeyup event
+    # We've handled the event, so suppress it and update the mode indicator.
+    DomUtils.suppressEvent event
 
   updateVisibleMarkers: (tabCount = 0) ->
     {hintKeystrokeQueue, linkTextKeystrokeQueue} = @markerMatcher
diff --git a/content_scripts/mode_key_handler.coffee b/content_scripts/mode_key_handler.coffee
index 914eeb6c..82fdc0e6 100644
--- a/content_scripts/mode_key_handler.coffee
+++ b/content_scripts/mode_key_handler.coffee
@@ -54,7 +54,12 @@ class KeyHandlerMode extends Mode
       @continueBubbling
     else if @isMappedKey keyChar
       DomUtils.consumeKeyup event, => @handleKeyChar keyChar
+    else if @isCountKey keyChar
+      digit = parseInt keyChar
+      @reset if @keyState.length == 1 then @countPrefix * 10 + digit else digit
+      @suppressEvent
     else
+      @reset()
       @continueBubbling
 
   # This tests whether there is a mapping of keyChar in the current key state (and accounts for pass keys).
diff --git a/content_scripts/vimium_frontend.coffee b/content_scripts/vimium_frontend.coffee
index 2331a8cf..b3a85bfb 100644
--- a/content_scripts/vimium_frontend.coffee
+++ b/content_scripts/vimium_frontend.coffee
@@ -687,4 +687,4 @@ root.bgLog = bgLog
 extend root, {handleEscapeForFindMode, handleEnterForFindMode, performFind, performBackwardsFind,
   enterFindMode, focusThisFrame}
 # These are exported only for the tests.
-extend root, {installModes, installListeners}
+extend root, {installModes}