diff --git a/.config/vim/vimrc.d/50-aesthetics.vim b/.config/vim/vimrc.d/50-aesthetics.vim
index 23ddc30..63d556b 100644
--- a/.config/vim/vimrc.d/50-aesthetics.vim
+++ b/.config/vim/vimrc.d/50-aesthetics.vim
@@ -40,3 +40,13 @@ if (get(g:, 'loaded_fzf'))
 	" Use a theme for bat in the preview that somewhat resembles onedark
 	let $BAT_THEME='TwoDark'
 endif
+
+" Highlight trailing whitespaces
+" Pattern taken from https://vim.fandom.com/wiki/Highlight_unwanted_spaces
+highlight TrailingWhitespace ctermbg=red guibg=red
+augroup HighlightTrailingWhitespace
+	au!
+	" NOTE: VimEnter is necessary as well as WinNew is not triggered for the
+	" first window created after startup (see :help WinNew)
+	au VimEnter,WinNew * call matchadd("TrailingWhitespace", '\s\+\%#\@<!$')
+augroup END
diff --git a/.config/vim/vimrc.d/80-autocommands.vim b/.config/vim/vimrc.d/80-autocommands.vim
index 3b9f323..589d22e 100644
--- a/.config/vim/vimrc.d/80-autocommands.vim
+++ b/.config/vim/vimrc.d/80-autocommands.vim
@@ -1,19 +1,4 @@
 " Autocommands """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Highlight trailing whitespaces
-" (https://vim.fandom.com/wiki/Highlight_unwanted_spaces)
-" Create highlight group
-highlight ExtraWhitespace ctermbg=red guibg=red
-" Associate with patter (trailing whitespaces)
-match ExtraWhitespace /\s\+$/
-" apply not only to the first window
-autocmd BufWinEnter * match ExtraWhitespace /\s\+$/
-" Do not match when typing at the end of a line
-autocmd InsertEnter * match ExtraWhitespace /\s\+\%#\@<!$/
-" Reset when leaving insert mode
-autocmd InsertLeave * match ExtraWhitespace /\s\+$/
-" Clear all matches
-autocmd BufWinLeave * call clearmatches()
-
 " Terminal
 if (has('nvim'))
 	" Disable spellcheck