diff --git a/plugin/trailing-whitespace.vim b/plugin/trailing-whitespace.vim
index 9b908a6..df184ad 100644
--- a/plugin/trailing-whitespace.vim
+++ b/plugin/trailing-whitespace.vim
@@ -15,11 +15,11 @@ endfunction
 " Highlight EOL whitespace, http://vim.wikia.com/wiki/Highlight_unwanted_spaces
 highlight default ExtraWhitespace ctermbg=darkred guibg=#382424
 autocmd ColorScheme * highlight default ExtraWhitespace ctermbg=red guibg=red
-autocmd BufRead,BufNew * if s:ShouldMatchWhitespace() | match ExtraWhitespace /\s\+$/ | else | match ExtraWhitespace /^^/ | endif
+autocmd BufRead,BufNew * if s:ShouldMatchWhitespace() | match ExtraWhitespace /[\u3000[:space:]]\+$/ | else | match ExtraWhitespace /^^/ | endif
 
 " The above flashes annoyingly while typing, be calmer in insert mode
-autocmd InsertLeave * if s:ShouldMatchWhitespace() | match ExtraWhitespace /\s\+$/ | endif
-autocmd InsertEnter * if s:ShouldMatchWhitespace() | match ExtraWhitespace /\s\+\%#\@<!$/ | endif
+autocmd InsertLeave * if s:ShouldMatchWhitespace() | match ExtraWhitespace /[\u3000[:space:]]\+$/ | endif
+autocmd InsertEnter * if s:ShouldMatchWhitespace() | match ExtraWhitespace /[\u3000[:space:]]\+\%#\@<!$/ | endif
 
 function! s:FixWhitespace(line1,line2)
     let l:save_cursor = getpos(".")