diff --git a/.vim/colors/baraknew.vim b/.vim/colors/baraknew.vim
index 803aebe..03df230 100644
--- a/.vim/colors/baraknew.vim
+++ b/.vim/colors/baraknew.vim
@@ -414,3 +414,8 @@ hi CANCELED guifg=red guibg=NONE ctermfg=red ctermbg=NONE
 hi STARTED guifg=yellow guibg=NONE ctermfg=yellow ctermbg=NONE
 hi NEXT guifg=cyan guibg=NONE ctermfg=cyan ctermbg=NONE
 hi DONE guifg=green guibg=NONE ctermfg=green ctermbg=NONE
+
+" For denite.nvim
+"
+
+hi deniteMatchedChar guifg=#FFFFFF guibg=#5F87FF ctermfg=15 ctermbg=27
diff --git a/.vimrc b/.vimrc
index 9ed5fe9..04f5d8a 100644
--- a/.vimrc
+++ b/.vimrc
@@ -611,7 +611,7 @@ nnoremap <Leader>ss :SyntasticSetLoclist<CR>
 nnoremap <Leader>fn :lnext<CR>
 " Prev quickfix.
 nnoremap <Leader>fp :lprev<CR>
-nnoremap <silent> <Leader>aw :<C-u>DeniteCursorWord -buffer-name=search-buffer grep<CR>
+nnoremap <silent> <Leader>aw :<C-u>DeniteCursorWord -mode=normal -buffer-name=search-buffer grep<CR>
 call denite#custom#var('grep', 'command', ['pt'])
 call denite#custom#var('grep', 'default_opts',
       \ ['--nogroup', '--nocolor', '--smart-case'])
@@ -619,6 +619,7 @@ call denite#custom#var('grep', 'recursive_opts', [])
 call denite#custom#var('grep', 'pattern_opt', [])
 call denite#custom#var('grep', 'separator', ['--'])
 call denite#custom#var('grep', 'final_opts', [])
+call denite#custom#option('search-buffer', 'highlight_matched_char', 'deniteMatchedChar')
 " For C++ -- A is a great plugin which allows you to jump from the c file to the
 " header and vice-versa. Mneumonic here is headerheader.
 nnoremap <Leader>hh :A<CR>