diff --git a/vim/vimrc b/vim/vimrc
index 1233eab..1010b5b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -462,7 +462,8 @@ end
 " Commands -------------------------------------------------------------------|
 
 " Find
-com -nargs=+ -complete=file -bar Gr silent! grep! "<Args>" | cwindow
+com -nargs=+ -bar Gr silent! grep! "<Args>" | cwindow
+com -nargs=+ -bar Grw silent! grep! "\b<Args>\b" | cwindow
 
 " Write (sudo)
 com W execute 'w !sudo tee > /dev/null %' | edit!
@@ -652,8 +653,9 @@ vn <PageUp> <NOp>
 nm cr <Plug>(abolish-coerce-word)
 
 " find
-nn KK :Gr \b<C-r><C-w>\b<CR>
-nn Kk :Gr<Space>
+nn KK :Grw <C-r><C-w><CR>
+nn Kr :Gr<Space>
+nn Kw :Grw<Space>
 
 " quick lambda
 nn <Leader>l iλ<Esc>