diff --git a/.vimrc b/.vimrc
index b970e60..2857bf4 100644
--- a/.vimrc
+++ b/.vimrc
@@ -253,7 +253,8 @@ let Tlist_Inc_Winwidth = 0
 "let Tlist_Use_Horiz_Window = 1
 let Tlist_Use_Right_Window = 1
 " open/close tag list window with F8
-map <silent> <F8> :TlistToggle<CR>
+"map <silent> <F8> :TlistToggle<CR>
+nmap <F8> :TagbarToggle<CR>
 
 " close preview window after a completion
 if has("autocmd")
@@ -536,6 +537,8 @@ Plugin 'vim-scripts/OmniCppComplete'
 " List current file function
 " let $GIT_SSL_NO_VERIFY = 'true'
 Plugin 'gitlab@gitlab.mathux.org:Mathieu/taglist.git'
+" Tagbar look like a maintened taglist
+Plugin 'majutsushi/tagbar'
 
 "Syntax checking
 Plugin 'scrooloose/syntastic.git'