diff --git a/vim/rc/plugins.rc.vim b/vim/rc/plugins.rc.vim
index 07eacdd..4c3985a 100644
--- a/vim/rc/plugins.rc.vim
+++ b/vim/rc/plugins.rc.vim
@@ -15,7 +15,6 @@ endfunction
 " Navigation {{
 Plug 'vim-scripts/file-line'
 Plug 'tpope/vim-vinegar'
-call s:smart_source_rc('plugins/Buffet')
 " }} Navigation
 
 " Git {{
diff --git a/vim/rc/plugins/buffet.rc.vim b/vim/rc/plugins/buffet.rc.vim
deleted file mode 100644
index 23ee47c..0000000
--- a/vim/rc/plugins/buffet.rc.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-Plug 'sandeepcr529/Buffet.vim', { 'on': 'Bufferlist' }
-nnoremap <silent> <F2> :Bufferlist<CR>
diff --git a/vim/rc/plugins/ctrlp.rc.vim b/vim/rc/plugins/ctrlp.rc.vim
index db0889b..7ddab67 100644
--- a/vim/rc/plugins/ctrlp.rc.vim
+++ b/vim/rc/plugins/ctrlp.rc.vim
@@ -39,6 +39,7 @@ nnoremap <leader>p :CtrlP<CR>
 nnoremap <leader>r :CtrlPTag<CR>
 nnoremap <leader>t :CtrlPBufTag<CR>
 nnoremap <leader>u :CtrlPCurFile<CR>
+nnoremap <silent> <F2> :CtrlPBuffer<CR>
 
 " Special stuff for The Silver Searcher
 if executable('ag')
diff --git a/vim/rc/plugins/fzf.rc.vim b/vim/rc/plugins/fzf.rc.vim
index 7fef9d9..12a8f34 100644
--- a/vim/rc/plugins/fzf.rc.vim
+++ b/vim/rc/plugins/fzf.rc.vim
@@ -24,6 +24,7 @@ if !exists('g:ctrlp_in_use')
     " Leader Commands
     " Find buffers
     nnoremap <leader>b :FZFBuffers<CR>
+    nnoremap <silent> <F2> :FZFBuffers<CR>
     " Find text in files
     nnoremap <leader>f :FZFAg<CR>
     " Find tags