diff --git a/autoload/gitmessenger/blame.vim b/autoload/gitmessenger/blame.vim
index d42e7bc..ad59913 100644
--- a/autoload/gitmessenger/blame.vim
+++ b/autoload/gitmessenger/blame.vim
@@ -25,7 +25,7 @@ function! s:blame__render() dict abort
         call self.popup.set_buf_var('__gitmessenger_diff', self.state.diff)
         let prev_is_word = self.state.prev_diff =~# '\.word$'
         let is_word = self.state.diff =~# '\.word$'
-        if self.state.diff !=# 'none' && prev_is_word != is_word
+        if self.state.diff !=# 'none' && (self.state.prev_diff == 'none' || prev_is_word != is_word)
             call self.popup.set_buf_var('&syntax', 'gitmessengerpopup')
         endif
     endif