diff --git a/src/keymap.coffee b/src/keymap.coffee
index 9c2d489bf..c066572b9 100644
--- a/src/keymap.coffee
+++ b/src/keymap.coffee
@@ -82,8 +82,7 @@ class Keymap
     element = event.target
     element = rootView[0] if element == document.body
     keystroke = @keystrokeStringForEvent(event, @queuedKeystroke)
-    mappings = @mappingsForKeystroke(keystroke)
-    mappings = @mappingsMatchingElement(mappings, element)
+    mappings = @mappingsForKeystrokeMatchingElement(keystroke, element)
 
     if mappings.length == 0 and @queuedKeystroke
       @queuedKeystroke = null
@@ -118,6 +117,10 @@ class Keymap
 
     mappings
 
+  mappingsForKeystrokeMatchingElement: (keystroke, element) ->
+    mappings = @mappingsForKeystroke(keystroke)
+    @mappingsMatchingElement(element, mappings)
+
   mappingsForKeystroke: (keystroke) ->
     mappings = @allMappings().filter (mapping) ->
       multiKeystroke = /\s/.test keystroke