diff --git a/autoload/nerdtree.vim b/autoload/nerdtree.vim
index f1d94a7..7622302 100644
--- a/autoload/nerdtree.vim
+++ b/autoload/nerdtree.vim
@@ -1228,11 +1228,11 @@ endfunction
 
 "FUNCTION: nerdtree#bindMappings() {{{2
 function! nerdtree#bindMappings()
-    "make <cr> do the same as the default 'o' mapping
-    exec "nnoremap <silent> <buffer> <cr> :call <SID>KeyMap_Invoke('". g:NERDTreeMapActivateNode ."')<cr>"
-
     call g:NERDTreeKeyMap.BindAll()
 
+    "make <cr> do the same as the default 'o' mapping
+    exec "nnoremap <silent> <buffer> <cr> :call nerdtree#invokeKeyMap('". g:NERDTreeMapActivateNode ."')<cr>"
+
     command! -buffer -nargs=? Bookmark :call <SID>bookmarkNode('<args>')
     command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 RevealBookmark :call <SID>revealBookmark('<args>')
     command! -buffer -complete=customlist,nerdtree#completeBookmarks -nargs=1 OpenBookmark :call <SID>openBookmark('<args>')