diff --git a/plugin/rhubarb.vim b/plugin/rhubarb.vim
index d8abb7f..1e0591b 100644
--- a/plugin/rhubarb.vim
+++ b/plugin/rhubarb.vim
@@ -101,7 +101,7 @@ endfunction
 augroup rhubarb
   autocmd!
   autocmd User Fugitive
-        \ if fugitive#buffer().path() =~# '^\.git.COMMIT_EDITMSG$' &&
+        \ if &filetype ==# 'gitcommit' && expand('%:t') ==# 'COMMIT_EDITMSG' &&
         \   exists('+omnifunc') &&
         \   &omnifunc =~# '^\%(syntaxcomplete#Complete\)\=$' &&
         \   join(readfile(fugitive#buffer().repo().dir('config')),"\n")