diff --git a/core/plugins.vim b/core/plugins.vim
index a7c13af..78bfb74 100644
--- a/core/plugins.vim
+++ b/core/plugins.vim
@@ -551,18 +551,24 @@ let g:gutentags_ctags_exclude = ['*.md', '*.html', '*.json', '*.toml', '*.css',
 let g:gutentags_cache_dir = stdpath('cache') . '/ctags'
 
 """"""""""""""""""""""""""" vista settings """"""""""""""""""""""""""""""""""
-" Double click to go to a tag
-nnoremap <silent> <2-LeftMouse> :<C-U>call vista#cursor#FoldOrJump()<CR>
-
 let g:vista#renderer#icons = {
-\   'member': '',
-\  }
+      \ 'member': '',
+      \ }
 
 " Do not echo message on command line
 let g:vista_echo_cursor = 0
 " Stay in current window when vista window is opened
 let g:vista_stay_on_open = 0
 
+augroup matchup_conf
+  autocmd!
+  " Double mouse click to go to a tag
+  autocmd FileType vista* nnoremap <buffer> <silent>
+        \ <2-LeftMouse> :<C-U>call vista#cursor#FoldOrJump()<CR>
+  " Quit Neovim if vista window is the only window
+  autocmd BufEnter * call s:close_vista_win()
+augroup END
+
 nnoremap <silent> <Space>t :<C-U>Vista!!<CR>
 
 function! s:close_vista_win() abort
@@ -570,11 +576,6 @@ function! s:close_vista_win() abort
     quit
   endif
 endfunction
-
-augroup vista_close_win
-  autocmd!
-  autocmd BufEnter * call s:close_vista_win()
-augroup END
 "}}
 
 "{{ File editting