diff --git a/after/ftplugin/markdown.vim b/after/ftplugin/markdown.vim
index 355c067..09b4f4c 100644
--- a/after/ftplugin/markdown.vim
+++ b/after/ftplugin/markdown.vim
@@ -3,8 +3,10 @@ set synmaxcol=3000  " For long Chinese paragraphs
 
 " Fix minor issue with footnote, see https://github.com/vim-pandoc/vim-markdownfootnotes/issues/22
 if exists(':FootnoteNumber')
-  nnoremap <buffer> <Plug>AddVimFootnote :<C-U>call markdownfootnotes#VimFootnotes('i')<CR>
-  inoremap <buffer> <Plug>AddVimFootnote <C-O>:<C-U>call markdownfootnotes#VimFootnotes('i')<CR>
+  nnoremap <buffer><silent> ^^ :<C-U>call markdownfootnotes#VimFootnotes('i')<CR>
+  inoremap <buffer><silent> ^^ <C-O>:<C-U>call markdownfootnotes#VimFootnotes('i')<CR>
+  imap <buffer> <silent> @@ <Plug>ReturnFromFootnote
+  nmap <buffer> <silent> @@ <Plug>ReturnFromFootnote
 endif
 
 " Text objects for Markdown code blocks.
diff --git a/core/plugins.vim b/core/plugins.vim
index 346f6c2..12c1a49 100644
--- a/core/plugins.vim
+++ b/core/plugins.vim
@@ -699,13 +699,6 @@ if g:is_win || g:is_mac
   nnoremap <silent> <M-S-m> :<C-U>MarkdownPreviewStop<CR>
 endif
 
-""""""""""""""""""""""""vim-markdownfootnotes settings""""""""""""""""""""""""
-" Replace the default mappings provided by the plugin
-imap ^^ <Plug>AddVimFootnote
-nmap ^^ <Plug>AddVimFootnote
-imap @@ <Plug>ReturnFromFootnote
-nmap @@ <Plug>ReturnFromFootnote
-
 """"""""""""""""""""""""vim-grammarous settings""""""""""""""""""""""""""""""
 if g:is_mac
   let g:grammarous#languagetool_cmd = 'languagetool'