diff --git a/autoload/OmniSharp/popup.vim b/autoload/OmniSharp/popup.vim
index a684277ef..479a4d6d9 100644
--- a/autoload/OmniSharp/popup.vim
+++ b/autoload/OmniSharp/popup.vim
@@ -318,6 +318,8 @@ function! s:VimOpen(what, opts) abort
   endif
   " Prevent popup buffer from being listed in buffer list (`:ls`)
   call setbufvar(winbufnr(winid), '&buflisted', 0)
+  " Make wrapping occur at word boundaries
+  call setwinvar(winid, '&linebreak', 1)
   return winid
 endfunction