diff --git a/plugin/keys.vim b/plugin/keys.vim
index 9d26569..b34cbad 100644
--- a/plugin/keys.vim
+++ b/plugin/keys.vim
@@ -155,5 +155,6 @@ nnoremap <C-A> ggVG<CR>
 inoremap <C-A> <C-O>:call Select()<CR>
 
 " fzf
+nnoremap <leader>ag :call fzf#vim#ag(expand('<cword>'),  WithGitRoot())<CR>
 nnoremap <leader>tg :call fzf#vim#tags(expand('<cword>'), {'options': '--exact --select-1 --exit-0'})<CR>
 
diff --git a/vimrc b/vimrc
index 157b0e0..a4ef2f7 100644
--- a/vimrc
+++ b/vimrc
@@ -272,12 +272,14 @@ let g:ctrlp_match_func = { 'match': 'cpsm#CtrlPMatch' }
 " --color: Search color options
 command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --no-ignore --hidden --follow --glob "!.git/*" --color "always" '.shellescape(<q-args>), 1, <bang>0)
 
-function! s:with_git_root()
-  let root = systemlist('git rev-parse --show-toplevel')[0]
-  return v:shell_error ? {} : {'dir': root}
+function! WithGitRoot()
+  let groot = systemlist('git -C ' . expand('%:p:h') . ' rev-parse --show-toplevel')[0]
+  return v:shell_error ? {} : {'dir': groot}
 endfunction
 
-command! -bang -nargs=* Rag call fzf#vim#ag_raw(<q-args>, s:with_git_root())
+command! -nargs=* Rag
+  \ call fzf#vim#ag(<q-args>,  WithGitRoot())
+
 
 " ==== conque ====
 " command aliases