Use Mode::push to handle adding/removing a handler

1 files changed, 1 insertions, 5 deletions

diff --git a/content_scripts/link_hints.coffee b/content_scripts/link_hints.coffee
index f2fb7c19..1e4670dd 100644
--- a/content_scripts/link_hints.coffee
+++ b/content_scripts/link_hints.coffee
@@ -249,17 +249,13 @@ class LinkHintsMode
           when "Control"
             @setOpenLinkMode(if @mode is OPEN_IN_NEW_FG_TAB then OPEN_IN_NEW_BG_TAB else OPEN_IN_NEW_FG_TAB)
 
-        handlerId = handlerStack.push
+        handlerId = @hintMode.push
           keyup: (event) =>
             if event.key == key
               handlerStack.remove()
               @setOpenLinkMode previousMode
             true # Continue bubbling the event.
 
-        # For some (unknown) reason, we don't always receive the keyup event needed to remove this handler.
-        # Therefore, we ensure that it's always removed when hint mode exits.  See #1911 and #1926.
-        @hintMode.onExit -> handlerStack.remove handlerId
-
     else if KeyboardUtils.isBackspace event
       if @markerMatcher.popKeyChar()
         @updateVisibleMarkers()